chore: migrate imports and remove jcenter (#32)

build.gradle

@@ -2,7 +2,6 @@
 buildscript {
     repositories {
         // External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
-        jcenter()
         mavenCentral()
         // gradle plugins
         maven {
@@ -138,11 +137,3 @@ run.workingDir = rootDir
 run.args = ["-homedir=terasology-server"]
 run.dependsOn setupServerConfig
 run.dependsOn setupServerModules
-
-// Support both standalone workspace (expect certain things provided) and embedding in a Terasology workspace (use task dependencies)
-if (project.name != project(':').name) {
-    run.dependsOn rootProject.extractNatives
-    run.dependsOn rootProject.moduleClasses
-} else {
-    // For a standalone workspace natives should be provided
-}

src/main/java/org/terasology/web/EngineRunner.java

@@ -15,20 +15,20 @@
  */
 package org.terasology.web;
 
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.TerasologyEngine;
-import org.terasology.engine.TerasologyEngineBuilder;
-import org.terasology.engine.modes.GameState;
-import org.terasology.engine.modes.StateIngame;
-import org.terasology.engine.modes.StateLoading;
-import org.terasology.engine.modes.StateMainMenu;
-import org.terasology.engine.subsystem.common.hibernation.HibernationSubsystem;
-import org.terasology.engine.subsystem.headless.HeadlessAudio;
-import org.terasology.engine.subsystem.headless.HeadlessGraphics;
-import org.terasology.engine.subsystem.headless.HeadlessInput;
-import org.terasology.engine.subsystem.headless.HeadlessTimer;
-import org.terasology.engine.subsystem.headless.mode.StateHeadlessSetup;
-import org.terasology.game.Game;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.TerasologyEngineBuilder;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.core.modes.StateIngame;
+import org.terasology.engine.core.modes.StateLoading;
+import org.terasology.engine.core.modes.StateMainMenu;
+import org.terasology.engine.core.subsystem.common.hibernation.HibernationSubsystem;
+import org.terasology.engine.core.subsystem.headless.HeadlessAudio;
+import org.terasology.engine.core.subsystem.headless.HeadlessGraphics;
+import org.terasology.engine.core.subsystem.headless.HeadlessInput;
+import org.terasology.engine.core.subsystem.headless.HeadlessTimer;
+import org.terasology.engine.core.subsystem.headless.mode.StateHeadlessSetup;
+import org.terasology.engine.game.Game;
 import org.terasology.web.io.JsonSession;
 import org.terasology.web.resources.ResourceManager;
 import org.terasology.web.serverAdminManagement.ServerAdminListUpdaterSystem;

src/main/java/org/terasology/web/ServerMain.java

@@ -45,11 +45,11 @@
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.config.Config;
-import org.terasology.config.SystemConfig;
-import org.terasology.engine.LoggingContext;
-import org.terasology.engine.paths.PathManager;
-import org.terasology.engine.subsystem.common.ConfigurationSubsystem;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.config.SystemConfig;
+import org.terasology.engine.core.LoggingContext;
+import org.terasology.engine.core.paths.PathManager;
+import org.terasology.engine.core.subsystem.common.ConfigurationSubsystem;
 import org.terasology.web.io.ActionResultMessageBodyWriter;
 import org.terasology.web.io.gsonUtils.GsonMessageBodyHandler;
 import org.terasology.web.serverAdminManagement.ServerAdminsManager;

src/main/java/org/terasology/web/StateEngineIdle.java

@@ -15,26 +15,28 @@
  */
 package org.terasology.web;
 
-import org.terasology.context.Context;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.GameEngine;
-import org.terasology.engine.LoggingContext;
-import org.terasology.engine.bootstrap.EntitySystemSetupUtil;
-import org.terasology.engine.modes.GameState;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.entity.internal.EngineEntityManager;
-import org.terasology.entitySystem.event.internal.EventSystem;
-import org.terasology.input.InputSystem;
-import org.terasology.logic.console.Console;
-import org.terasology.logic.console.ConsoleImpl;
-import org.terasology.logic.console.ConsoleSystem;
-import org.terasology.logic.console.commands.CoreCommands;
-import org.terasology.logic.players.LocalPlayer;
-import org.terasology.network.ClientComponent;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.rendering.nui.NUIManager;
-import org.terasology.rendering.nui.internal.CanvasRenderer;
-import org.terasology.rendering.nui.internal.NUIManagerInternal;
+
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.GameEngine;
+import org.terasology.engine.core.LoggingContext;
+import org.terasology.engine.core.bootstrap.EntitySystemSetupUtil;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
+import org.terasology.engine.entitySystem.event.internal.EventSystem;
+import org.terasology.engine.input.InputSystem;
+import org.terasology.engine.logic.console.Console;
+import org.terasology.engine.logic.console.ConsoleImpl;
+import org.terasology.engine.logic.console.ConsoleSystem;
+import org.terasology.engine.logic.console.commands.CoreCommands;
+import org.terasology.engine.logic.players.LocalPlayer;
+import org.terasology.engine.network.ClientComponent;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.engine.rendering.nui.internal.NUIManagerInternal;
+import org.terasology.engine.rendering.nui.internal.TerasologyCanvasRenderer;
+import org.terasology.nui.canvas.CanvasRenderer;
 
 /**
  * An engine state similar to {@link org.terasology.engine.subsystem.headless.mode.StateHeadlessSetup} which doesn't
@@ -60,7 +62,7 @@ public void init(GameEngine engine) {
         eventSystem = context.get(EventSystem.class);
         context.put(Console.class, new ConsoleImpl(context));
 
-        NUIManager nuiManager = new NUIManagerInternal(context.get(CanvasRenderer.class), context);
+        NUIManager nuiManager = new NUIManagerInternal(context.get(TerasologyCanvasRenderer.class), context);
         context.put(NUIManager.class, nuiManager);
 
         componentSystemManager = new ComponentSystemManager(context);

src/main/java/org/terasology/web/authentication/AuthenticationHandshakeHandlerImpl.java

@@ -15,10 +15,10 @@
  */
 package org.terasology.web.authentication;
 
-import org.terasology.config.SecurityConfig;
-import org.terasology.identity.CertificatePair;
-import org.terasology.identity.IdentityConstants;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.config.SecurityConfig;
+import org.terasology.engine.identity.CertificatePair;
+import org.terasology.engine.identity.IdentityConstants;
+import org.terasology.engine.identity.PublicIdentityCertificate;
 
 import java.security.SecureRandom;
 

src/main/java/org/terasology/web/authentication/HandshakeHello.java

@@ -16,7 +16,7 @@
 package org.terasology.web.authentication;
 
 import com.google.common.primitives.Bytes;
-import org.terasology.identity.PublicIdentityCertificate;
+import org.terasology.engine.identity.PublicIdentityCertificate;
 import org.terasology.web.io.gsonUtils.InvalidClientMessageException;
 import org.terasology.web.io.gsonUtils.Validable;
 

src/main/java/org/terasology/web/client/AnonymousHeadlessClient.java

@@ -15,9 +15,12 @@
  */
 package org.terasology.web.client;
 
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.rendering.nui.Color;
+
+import org.joml.Vector3ic;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.nui.Color;
 
 /**
  * This class is used to make an anonymous client, which is used to get read-only access to resources.
@@ -66,4 +69,14 @@ public String getId() {
     public Color getColor() {
         return Color.BLACK;
     }
+
+    @Override
+    public void onChunkRelevant(Vector3ic pos, Chunk chunk) {
+
+    }
+
+    @Override
+    public void onChunkIrrelevant(Vector3ic pos) {
+
+    }
 }

src/main/java/org/terasology/web/client/AuthenticatedHeadlessClient.java

@@ -15,10 +15,12 @@
  */
 package org.terasology.web.client;
 
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.internal.AbstractClient;
-import org.terasology.rendering.nui.Color;
+import org.joml.Vector3ic;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.internal.AbstractClient;
+import org.terasology.engine.world.chunks.Chunk;
+import org.terasology.nui.Color;
 
 /**
  * This class is used to make an authenticated client, which is able to connect to the
@@ -69,4 +71,13 @@ public Color getColor() {
         return Color.BLACK; //TODO temporary default
     }
 
+    @Override
+    public void onChunkRelevant(Vector3ic pos, Chunk chunk) {
+
+    }
+
+    @Override
+    public void onChunkIrrelevant(Vector3ic pos) {
+
+    }
 }

src/main/java/org/terasology/web/client/HeadlessClient.java

@@ -15,15 +15,15 @@
  */
 package org.terasology.web.client;
 
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.network.Client;
+import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
+import org.terasology.engine.world.chunks.Chunk;
 import org.terasology.math.geom.Vector3i;
-import org.terasology.network.Client;
-import org.terasology.rendering.world.viewDistance.ViewDistance;
 import org.terasology.web.serverAdminManagement.AdminPermissionManager;
 import org.terasology.web.serverAdminManagement.ServerAdminsManager;
-import org.terasology.world.chunks.Chunk;
 
 /**
  * Interface for clients attempting to access resources or connect to the web interface frontend.
@@ -38,14 +38,6 @@ default ClientSecurityInfo getSecurityInfo() {
                 AdminPermissionManager.getInstance().getPermissionsOfAdmin(getId()));
     }
 
-    @Override
-    default void onChunkRelevant(Vector3i pos, Chunk chunk) {
-    }
-
-    @Override
-    default void onChunkIrrelevant(Vector3i pos) {
-    }
-
     @Override
     default void update(boolean netTick) {
     }

src/main/java/org/terasology/web/client/HeadlessClientFactory.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.client;
 
-import org.terasology.entitySystem.entity.EntityManager;
+import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.web.EngineRunner;
 
 /**

src/main/java/org/terasology/web/io/JsonSession.java

@@ -19,17 +19,17 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSyntaxException;
-import org.terasology.config.Config;
-import org.terasology.engine.modes.GameState;
-import org.terasology.entitySystem.entity.EntityManager;
+import org.terasology.engine.config.Config;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+import org.terasology.engine.identity.storageServiceClient.BigIntegerBase64Serializer;
+import org.terasology.engine.utilities.gson.UriTypeAdapterFactory;
 import org.terasology.i18n.I18nMap;
 import org.terasology.i18n.gson.I18nMapTypeAdapter;
-import org.terasology.identity.storageServiceClient.BigIntegerBase64Serializer;
 import org.terasology.naming.Name;
 import org.terasology.naming.Version;
 import org.terasology.naming.gson.NameTypeAdapter;
 import org.terasology.naming.gson.VersionTypeAdapter;
-import org.terasology.utilities.gson.UriTypeAdapterFactory;
 import org.terasology.web.EngineRunner;
 import org.terasology.web.resources.base.InputParser;
 import org.terasology.web.resources.base.ResourceMethodName;

src/main/java/org/terasology/web/resources/DefaultComponentSystem.java

@@ -15,7 +15,8 @@
  */
 package org.terasology.web.resources;
 
-import org.terasology.entitySystem.systems.ComponentSystem;
+
+import org.terasology.engine.entitySystem.systems.ComponentSystem;
 
 /**
  * Extension of {@link org.terasology.entitySystem.systems.ComponentSystem} which provides default

src/main/java/org/terasology/web/resources/ResourceManager.java

@@ -17,14 +17,14 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.context.Context;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.TerasologyEngine;
-import org.terasology.engine.modes.GameState;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.ComponentSystem;
-import org.terasology.network.internal.ServerConnectListManager;
-import org.terasology.registry.InjectionHelper;
+import org.terasology.engine.context.Context;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.TerasologyEngine;
+import org.terasology.engine.core.modes.GameState;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.ComponentSystem;
+import org.terasology.engine.network.internal.ServerConnectListManager;
+import org.terasology.engine.registry.InjectionHelper;
 import org.terasology.web.client.HeadlessClient;
 import org.terasology.web.io.ActionResult;
 import org.terasology.web.resources.base.InputParser;

src/main/java/org/terasology/web/resources/base/AbstractObservableResource.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.entity.EntityRef;
 
 /**
  * Base class for a {@link org.terasology.web.resources.base.Resource} which can notify an attached resource observer

src/main/java/org/terasology/web/resources/base/ParameterlessMethodHandler.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.network.Client;
+import org.terasology.engine.network.Client;
 
 /**
  * Method handler for {@link ResourceMethodFactory} which is used for resources where the client needs to get

src/main/java/org/terasology/web/resources/base/ParametrizedMethodHandler.java

@@ -15,7 +15,8 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.network.Client;
+
+import org.terasology.engine.network.Client;
 
 /**
  * Method handler for {@link ResourceMethodFactory} which is used for resources where the client needs to

src/main/java/org/terasology/web/resources/base/ResourceMethod.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.network.Client;
+import org.terasology.engine.network.Client;
 import org.terasology.web.client.ClientSecurityInfo;
 
 /**

src/main/java/org/terasology/web/resources/base/ResourceMethodFactory.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.network.Client;
+import org.terasology.engine.network.Client;
 import org.terasology.web.ThrowingRunnable;
 import org.terasology.web.client.ClientSecurityInfo;
 

src/main/java/org/terasology/web/resources/base/ResourceMethodImpl.java

@@ -15,7 +15,7 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.network.Client;
+import org.terasology.engine.network.Client;
 import org.terasology.web.client.ClientSecurityInfo;
 
 /**

src/main/java/org/terasology/web/resources/base/ResourceObserver.java

@@ -15,7 +15,8 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.entitySystem.entity.EntityRef;
+
+import org.terasology.engine.entitySystem.entity.EntityRef;
 
 /**
  * Interface for a resource observer. A resource observer looks at a particular resource

src/main/java/org/terasology/web/resources/base/RouterResource.java

@@ -15,8 +15,8 @@
  */
 package org.terasology.web.resources.base;
 
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.network.Client;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.network.Client;
 import org.terasology.web.client.ClientSecurityInfo;
 
 import java.util.HashMap;