From c954c5cfcaa5cd642e6686ece2113d0fab36cc5c Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Fri, 16 Apr 2021 13:12:07 -0700 Subject: [PATCH] chore: migrate imports and remove jcenter (#32) --- build.gradle | 9 ---- .../java/org/terasology/web/EngineRunner.java | 28 ++++++------ .../java/org/terasology/web/ServerMain.java | 10 ++--- .../org/terasology/web/StateEngineIdle.java | 44 ++++++++++--------- .../AuthenticationHandshakeHandlerImpl.java | 8 ++-- .../web/authentication/HandshakeHello.java | 2 +- .../web/client/AnonymousHeadlessClient.java | 19 ++++++-- .../client/AuthenticatedHeadlessClient.java | 19 ++++++-- .../terasology/web/client/HeadlessClient.java | 20 +++------ .../web/client/HeadlessClientFactory.java | 2 +- .../org/terasology/web/io/JsonSession.java | 10 ++--- .../web/resources/DefaultComponentSystem.java | 3 +- .../web/resources/ResourceManager.java | 16 +++---- .../base/AbstractObservableResource.java | 2 +- .../base/ParameterlessMethodHandler.java | 2 +- .../base/ParametrizedMethodHandler.java | 3 +- .../web/resources/base/ResourceMethod.java | 2 +- .../resources/base/ResourceMethodFactory.java | 2 +- .../resources/base/ResourceMethodImpl.java | 2 +- .../web/resources/base/ResourceObserver.java | 3 +- .../web/resources/base/RouterResource.java | 4 +- .../base/VoidParameterlessMethodHandler.java | 3 +- .../config/AbstractConfigEntryResource.java | 4 +- .../resources/config/ServerMotdResource.java | 3 +- .../resources/config/ServerPortResource.java | 3 +- .../connectLists/ConnectListResource.java | 2 +- .../resources/console/ConsoleResource.java | 24 +++++----- .../engineState/EngineStateMetadata.java | 18 ++++---- .../engineState/EngineStateResource.java | 4 +- .../web/resources/games/DeleteGameMethod.java | 7 +-- .../resources/games/GamesBackupsResource.java | 5 ++- .../web/resources/games/GamesResource.java | 12 ++--- .../web/resources/games/NewGameMetadata.java | 2 +- .../web/resources/games/NewGameMethod.java | 14 +++--- .../web/resources/games/PatchGameMethod.java | 6 +-- .../modules/AvailableModulesResource.java | 4 +- .../modules/ModuleInstallerResource.java | 10 ++--- .../onlinePlayers/OnlinePlayerMetadata.java | 4 +- .../onlinePlayers/OnlinePlayersResource.java | 14 +++--- .../AvailableWorldGeneratorsResource.java | 8 ++-- .../web/resources/worldMap/WorldMapInput.java | 3 +- .../resources/worldMap/WorldMapResource.java | 41 ++++++++--------- .../AdminPermissionManager.java | 14 +++--- .../serverAdminManagement/PermissionType.java | 2 +- .../ServerAdminListUpdaterSystem.java | 8 ++-- .../ServerAdminsManager.java | 2 +- .../terasology/web/servlet/AboutServlet.java | 1 - .../terasology/web/servlet/LogServlet.java | 2 - .../terasology/web/io/JsonSessionTest.java | 12 ++--- .../console/ConsoleResourceTest.java | 2 +- .../engineState/EngineStateResourceTest.java | 8 ++-- .../resources/games/DeleteGameMethodTest.java | 2 +- .../games/GamesBackupResourceTest.java | 4 +- .../resources/games/NewGameMethodTest.java | 8 ++-- .../resources/games/PatchGameMethodTest.java | 4 +- .../modules/AvailableModulesResourceTest.java | 6 +-- .../OnlinePlayersResourceTest.java | 18 ++++---- .../AvailableWorldGeneratorsResourceTest.java | 10 ++--- .../worldMap/WorldMapResourceTest.java | 16 +++---- .../AdminPermissionManagerTest.java | 14 +++--- 60 files changed, 275 insertions(+), 259 deletions(-) diff --git a/build.gradle b/build.gradle index 5d5f570..aeb8927 100644 --- a/build.gradle +++ b/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 -} diff --git a/src/main/java/org/terasology/web/EngineRunner.java b/src/main/java/org/terasology/web/EngineRunner.java index 4f2c4df..e79e780 100644 --- a/src/main/java/org/terasology/web/EngineRunner.java +++ b/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; diff --git a/src/main/java/org/terasology/web/ServerMain.java b/src/main/java/org/terasology/web/ServerMain.java index d62a08d..720a130 100644 --- a/src/main/java/org/terasology/web/ServerMain.java +++ b/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; diff --git a/src/main/java/org/terasology/web/StateEngineIdle.java b/src/main/java/org/terasology/web/StateEngineIdle.java index 5bf2a08..5af6846 100644 --- a/src/main/java/org/terasology/web/StateEngineIdle.java +++ b/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); diff --git a/src/main/java/org/terasology/web/authentication/AuthenticationHandshakeHandlerImpl.java b/src/main/java/org/terasology/web/authentication/AuthenticationHandshakeHandlerImpl.java index bc7d359..ea1328e 100644 --- a/src/main/java/org/terasology/web/authentication/AuthenticationHandshakeHandlerImpl.java +++ b/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; diff --git a/src/main/java/org/terasology/web/authentication/HandshakeHello.java b/src/main/java/org/terasology/web/authentication/HandshakeHello.java index fd3369c..99466e5 100644 --- a/src/main/java/org/terasology/web/authentication/HandshakeHello.java +++ b/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; diff --git a/src/main/java/org/terasology/web/client/AnonymousHeadlessClient.java b/src/main/java/org/terasology/web/client/AnonymousHeadlessClient.java index 85be139..e13979f 100644 --- a/src/main/java/org/terasology/web/client/AnonymousHeadlessClient.java +++ b/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) { + + } } diff --git a/src/main/java/org/terasology/web/client/AuthenticatedHeadlessClient.java b/src/main/java/org/terasology/web/client/AuthenticatedHeadlessClient.java index 095e99d..2c03cf3 100644 --- a/src/main/java/org/terasology/web/client/AuthenticatedHeadlessClient.java +++ b/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) { + + } } diff --git a/src/main/java/org/terasology/web/client/HeadlessClient.java b/src/main/java/org/terasology/web/client/HeadlessClient.java index 03a8e31..a43c04b 100644 --- a/src/main/java/org/terasology/web/client/HeadlessClient.java +++ b/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) { } diff --git a/src/main/java/org/terasology/web/client/HeadlessClientFactory.java b/src/main/java/org/terasology/web/client/HeadlessClientFactory.java index 98b0bf2..6c7f41d 100644 --- a/src/main/java/org/terasology/web/client/HeadlessClientFactory.java +++ b/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; /** diff --git a/src/main/java/org/terasology/web/io/JsonSession.java b/src/main/java/org/terasology/web/io/JsonSession.java index 1ef44b7..a1a694f 100644 --- a/src/main/java/org/terasology/web/io/JsonSession.java +++ b/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; diff --git a/src/main/java/org/terasology/web/resources/DefaultComponentSystem.java b/src/main/java/org/terasology/web/resources/DefaultComponentSystem.java index 46ce63c..fb570bd 100644 --- a/src/main/java/org/terasology/web/resources/DefaultComponentSystem.java +++ b/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 diff --git a/src/main/java/org/terasology/web/resources/ResourceManager.java b/src/main/java/org/terasology/web/resources/ResourceManager.java index ee778af..99c5865 100644 --- a/src/main/java/org/terasology/web/resources/ResourceManager.java +++ b/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; diff --git a/src/main/java/org/terasology/web/resources/base/AbstractObservableResource.java b/src/main/java/org/terasology/web/resources/base/AbstractObservableResource.java index 710c89f..b69e96e 100644 --- a/src/main/java/org/terasology/web/resources/base/AbstractObservableResource.java +++ b/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 diff --git a/src/main/java/org/terasology/web/resources/base/ParameterlessMethodHandler.java b/src/main/java/org/terasology/web/resources/base/ParameterlessMethodHandler.java index 70fe57b..997c050 100644 --- a/src/main/java/org/terasology/web/resources/base/ParameterlessMethodHandler.java +++ b/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 diff --git a/src/main/java/org/terasology/web/resources/base/ParametrizedMethodHandler.java b/src/main/java/org/terasology/web/resources/base/ParametrizedMethodHandler.java index 1ad6d0c..81f3885 100644 --- a/src/main/java/org/terasology/web/resources/base/ParametrizedMethodHandler.java +++ b/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 diff --git a/src/main/java/org/terasology/web/resources/base/ResourceMethod.java b/src/main/java/org/terasology/web/resources/base/ResourceMethod.java index a3850d5..274d424 100644 --- a/src/main/java/org/terasology/web/resources/base/ResourceMethod.java +++ b/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; /** diff --git a/src/main/java/org/terasology/web/resources/base/ResourceMethodFactory.java b/src/main/java/org/terasology/web/resources/base/ResourceMethodFactory.java index f9994bf..809e465 100644 --- a/src/main/java/org/terasology/web/resources/base/ResourceMethodFactory.java +++ b/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; diff --git a/src/main/java/org/terasology/web/resources/base/ResourceMethodImpl.java b/src/main/java/org/terasology/web/resources/base/ResourceMethodImpl.java index 49f54a8..74a4b03 100644 --- a/src/main/java/org/terasology/web/resources/base/ResourceMethodImpl.java +++ b/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; /** diff --git a/src/main/java/org/terasology/web/resources/base/ResourceObserver.java b/src/main/java/org/terasology/web/resources/base/ResourceObserver.java index 8ddfb6d..bda1355 100644 --- a/src/main/java/org/terasology/web/resources/base/ResourceObserver.java +++ b/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 diff --git a/src/main/java/org/terasology/web/resources/base/RouterResource.java b/src/main/java/org/terasology/web/resources/base/RouterResource.java index 1b57ae8..fca756f 100644 --- a/src/main/java/org/terasology/web/resources/base/RouterResource.java +++ b/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; diff --git a/src/main/java/org/terasology/web/resources/base/VoidParameterlessMethodHandler.java b/src/main/java/org/terasology/web/resources/base/VoidParameterlessMethodHandler.java index 88fe393..8cb9495 100644 --- a/src/main/java/org/terasology/web/resources/base/VoidParameterlessMethodHandler.java +++ b/src/main/java/org/terasology/web/resources/base/VoidParameterlessMethodHandler.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} that is used for resources where the server does not need to diff --git a/src/main/java/org/terasology/web/resources/config/AbstractConfigEntryResource.java b/src/main/java/org/terasology/web/resources/config/AbstractConfigEntryResource.java index 565ca79..7702644 100644 --- a/src/main/java/org/terasology/web/resources/config/AbstractConfigEntryResource.java +++ b/src/main/java/org/terasology/web/resources/config/AbstractConfigEntryResource.java @@ -15,8 +15,8 @@ */ package org.terasology.web.resources.config; -import org.terasology.config.Config; -import org.terasology.registry.In; +import org.terasology.engine.config.Config; +import org.terasology.engine.registry.In; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.AbstractSimpleResource; import org.terasology.web.resources.base.ClientSecurityRequirements; diff --git a/src/main/java/org/terasology/web/resources/config/ServerMotdResource.java b/src/main/java/org/terasology/web/resources/config/ServerMotdResource.java index c1d6a44..ec325dd 100644 --- a/src/main/java/org/terasology/web/resources/config/ServerMotdResource.java +++ b/src/main/java/org/terasology/web/resources/config/ServerMotdResource.java @@ -15,7 +15,8 @@ */ package org.terasology.web.resources.config; -import org.terasology.config.Config; + +import org.terasology.engine.config.Config; /** * Resource used to get and set the server's MOTD. diff --git a/src/main/java/org/terasology/web/resources/config/ServerPortResource.java b/src/main/java/org/terasology/web/resources/config/ServerPortResource.java index 84d775b..fd416eb 100644 --- a/src/main/java/org/terasology/web/resources/config/ServerPortResource.java +++ b/src/main/java/org/terasology/web/resources/config/ServerPortResource.java @@ -15,7 +15,8 @@ */ package org.terasology.web.resources.config; -import org.terasology.config.Config; + +import org.terasology.engine.config.Config; /** * Resource used to get and set the server port. diff --git a/src/main/java/org/terasology/web/resources/connectLists/ConnectListResource.java b/src/main/java/org/terasology/web/resources/connectLists/ConnectListResource.java index 9eba987..3eab2b6 100644 --- a/src/main/java/org/terasology/web/resources/connectLists/ConnectListResource.java +++ b/src/main/java/org/terasology/web/resources/connectLists/ConnectListResource.java @@ -15,7 +15,7 @@ */ package org.terasology.web.resources.connectLists; -import org.terasology.network.internal.ServerConnectListManager; +import org.terasology.engine.network.internal.ServerConnectListManager; import org.terasology.web.resources.base.AbstractItemCollectionResource; import org.terasology.web.resources.base.ClientSecurityRequirements; import org.terasology.web.resources.base.ResourceAccessException; diff --git a/src/main/java/org/terasology/web/resources/console/ConsoleResource.java b/src/main/java/org/terasology/web/resources/console/ConsoleResource.java index 0843c4f..88a75b2 100644 --- a/src/main/java/org/terasology/web/resources/console/ConsoleResource.java +++ b/src/main/java/org/terasology/web/resources/console/ConsoleResource.java @@ -15,19 +15,19 @@ */ package org.terasology.web.resources.console; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.entitySystem.event.ReceiveEvent; -import org.terasology.entitySystem.systems.RegisterSystem; -import org.terasology.logic.console.Console; -import org.terasology.logic.console.ConsoleColors; -import org.terasology.logic.console.ConsoleMessageEvent; -import org.terasology.logic.console.MessageEvent; -import org.terasology.logic.console.commandSystem.ConsoleCommand; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.entitySystem.event.ReceiveEvent; +import org.terasology.engine.entitySystem.systems.RegisterSystem; +import org.terasology.engine.logic.console.Console; +import org.terasology.engine.logic.console.ConsoleColors; +import org.terasology.engine.logic.console.ConsoleMessageEvent; +import org.terasology.engine.logic.console.MessageEvent; +import org.terasology.engine.logic.console.commandSystem.ConsoleCommand; +import org.terasology.engine.network.ClientComponent; +import org.terasology.engine.network.events.ConnectedEvent; +import org.terasology.engine.registry.In; import org.terasology.naming.Name; -import org.terasology.network.ClientComponent; -import org.terasology.network.events.ConnectedEvent; -import org.terasology.registry.In; -import org.terasology.rendering.FontColor; +import org.terasology.nui.FontColor; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.DefaultComponentSystem; import org.terasology.web.resources.base.*; diff --git a/src/main/java/org/terasology/web/resources/engineState/EngineStateMetadata.java b/src/main/java/org/terasology/web/resources/engineState/EngineStateMetadata.java index ff6abf8..19c02da 100644 --- a/src/main/java/org/terasology/web/resources/engineState/EngineStateMetadata.java +++ b/src/main/java/org/terasology/web/resources/engineState/EngineStateMetadata.java @@ -16,15 +16,15 @@ package org.terasology.web.resources.engineState; import com.google.common.collect.ImmutableMap; -import org.terasology.engine.GameEngine; -import org.terasology.engine.modes.GameState; -import org.terasology.engine.modes.StateIngame; -import org.terasology.engine.modes.StateLoading; -import org.terasology.engine.subsystem.headless.mode.StateHeadlessSetup; -import org.terasology.game.Game; -import org.terasology.network.NetworkMode; -import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameInfo; -import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameProvider; +import org.terasology.engine.core.GameEngine; +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.subsystem.headless.mode.StateHeadlessSetup; +import org.terasology.engine.game.Game; +import org.terasology.engine.network.NetworkMode; +import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameInfo; +import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameProvider; import org.terasology.web.StateEngineIdle; import org.terasology.web.io.ActionResult; import org.terasology.web.io.JsonSession; diff --git a/src/main/java/org/terasology/web/resources/engineState/EngineStateResource.java b/src/main/java/org/terasology/web/resources/engineState/EngineStateResource.java index a6e183a..4d1aab4 100644 --- a/src/main/java/org/terasology/web/resources/engineState/EngineStateResource.java +++ b/src/main/java/org/terasology/web/resources/engineState/EngineStateResource.java @@ -15,8 +15,8 @@ */ package org.terasology.web.resources.engineState; -import org.terasology.engine.GameEngine; -import org.terasology.registry.In; +import org.terasology.engine.core.GameEngine; +import org.terasology.engine.registry.In; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.AbstractSimpleResource; import org.terasology.web.resources.base.ClientSecurityRequirements; diff --git a/src/main/java/org/terasology/web/resources/games/DeleteGameMethod.java b/src/main/java/org/terasology/web/resources/games/DeleteGameMethod.java index 705dfbb..ebcdc22 100644 --- a/src/main/java/org/terasology/web/resources/games/DeleteGameMethod.java +++ b/src/main/java/org/terasology/web/resources/games/DeleteGameMethod.java @@ -15,9 +15,10 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.paths.PathManager; -import org.terasology.network.Client; -import org.terasology.utilities.FilesUtil; + +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.network.Client; +import org.terasology.engine.utilities.FilesUtil; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ClientSecurityRequirements; diff --git a/src/main/java/org/terasology/web/resources/games/GamesBackupsResource.java b/src/main/java/org/terasology/web/resources/games/GamesBackupsResource.java index 9b22855..4e81f38 100644 --- a/src/main/java/org/terasology/web/resources/games/GamesBackupsResource.java +++ b/src/main/java/org/terasology/web/resources/games/GamesBackupsResource.java @@ -15,8 +15,9 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; + +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.AbstractSimpleResource; diff --git a/src/main/java/org/terasology/web/resources/games/GamesResource.java b/src/main/java/org/terasology/web/resources/games/GamesResource.java index 6f518ab..1f92c52 100644 --- a/src/main/java/org/terasology/web/resources/games/GamesResource.java +++ b/src/main/java/org/terasology/web/resources/games/GamesResource.java @@ -15,12 +15,12 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.module.ModuleManager; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; -import org.terasology.registry.In; -import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameInfo; -import org.terasology.rendering.nui.layers.mainMenu.savedGames.GameProvider; +import org.terasology.engine.core.module.ModuleManager; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; +import org.terasology.engine.registry.In; +import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameInfo; +import org.terasology.engine.rendering.nui.layers.mainMenu.savedGames.GameProvider; import org.terasology.web.EngineRunner; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; diff --git a/src/main/java/org/terasology/web/resources/games/NewGameMetadata.java b/src/main/java/org/terasology/web/resources/games/NewGameMetadata.java index 9e94512..53fba56 100644 --- a/src/main/java/org/terasology/web/resources/games/NewGameMetadata.java +++ b/src/main/java/org/terasology/web/resources/games/NewGameMetadata.java @@ -15,7 +15,7 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.SimpleUri; +import org.terasology.engine.core.SimpleUri; import org.terasology.naming.Name; import java.util.List; diff --git a/src/main/java/org/terasology/web/resources/games/NewGameMethod.java b/src/main/java/org/terasology/web/resources/games/NewGameMethod.java index 0f25004..9be8dd6 100644 --- a/src/main/java/org/terasology/web/resources/games/NewGameMethod.java +++ b/src/main/java/org/terasology/web/resources/games/NewGameMethod.java @@ -15,21 +15,21 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.TerasologyConstants; -import org.terasology.engine.module.ModuleManager; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; +import org.terasology.engine.core.TerasologyConstants; +import org.terasology.engine.core.module.ModuleManager; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; +import org.terasology.engine.world.internal.WorldInfo; +import org.terasology.engine.world.time.WorldTime; import org.terasology.module.DependencyResolver; import org.terasology.module.Module; import org.terasology.module.ResolutionResult; -import org.terasology.network.Client; +import org.terasology.engine.network.Client; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ClientSecurityRequirements; import org.terasology.web.resources.base.ResourceMethodImpl; import org.terasology.web.serverAdminManagement.PermissionType; -import org.terasology.world.internal.WorldInfo; -import org.terasology.world.time.WorldTime; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/org/terasology/web/resources/games/PatchGameMethod.java b/src/main/java/org/terasology/web/resources/games/PatchGameMethod.java index 036b510..618276d 100644 --- a/src/main/java/org/terasology/web/resources/games/PatchGameMethod.java +++ b/src/main/java/org/terasology/web/resources/games/PatchGameMethod.java @@ -15,9 +15,9 @@ */ package org.terasology.web.resources.games; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; -import org.terasology.network.Client; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; +import org.terasology.engine.network.Client; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ClientSecurityRequirements; diff --git a/src/main/java/org/terasology/web/resources/modules/AvailableModulesResource.java b/src/main/java/org/terasology/web/resources/modules/AvailableModulesResource.java index 1618d1b..b991ded 100644 --- a/src/main/java/org/terasology/web/resources/modules/AvailableModulesResource.java +++ b/src/main/java/org/terasology/web/resources/modules/AvailableModulesResource.java @@ -15,12 +15,12 @@ */ package org.terasology.web.resources.modules; -import org.terasology.engine.module.ModuleManager; +import org.terasology.engine.core.module.ModuleManager; +import org.terasology.engine.registry.In; import org.terasology.i18n.I18nMap; import org.terasology.module.Module; import org.terasology.module.ModuleMetadata; import org.terasology.naming.Name; -import org.terasology.registry.In; import org.terasology.web.resources.base.StreamBasedItemCollectionResource; import java.util.Comparator; diff --git a/src/main/java/org/terasology/web/resources/modules/ModuleInstallerResource.java b/src/main/java/org/terasology/web/resources/modules/ModuleInstallerResource.java index 59f442a..3b37ce7 100644 --- a/src/main/java/org/terasology/web/resources/modules/ModuleInstallerResource.java +++ b/src/main/java/org/terasology/web/resources/modules/ModuleInstallerResource.java @@ -15,12 +15,13 @@ */ package org.terasology.web.resources.modules; -import org.terasology.engine.module.DependencyResolutionFailedException; -import org.terasology.engine.module.ModuleManager; +import org.terasology.engine.core.module.DependencyResolutionFailedException; +import org.terasology.engine.core.module.ModuleManager; +import org.terasology.engine.registry.In; +import org.terasology.engine.utilities.download.MultiFileTransferProgressListener; +import org.terasology.engine.world.generator.internal.WorldGeneratorManager; import org.terasology.module.Module; import org.terasology.naming.Name; -import org.terasology.registry.In; -import org.terasology.utilities.download.MultiFileTransferProgressListener; import org.terasology.web.io.ActionResult; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.AbstractSimpleResource; @@ -28,7 +29,6 @@ import org.terasology.web.resources.base.ResourceMethod; import org.terasology.web.resources.base.ResourcePath; import org.terasology.web.serverAdminManagement.PermissionType; -import org.terasology.world.generator.internal.WorldGeneratorManager; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayerMetadata.java b/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayerMetadata.java index 3c21bc4..1592a2d 100644 --- a/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayerMetadata.java +++ b/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayerMetadata.java @@ -15,8 +15,8 @@ */ package org.terasology.web.resources.onlinePlayers; -import org.terasology.network.Client; -import org.terasology.rendering.nui.Color; +import org.terasology.engine.network.Client; +import org.terasology.nui.Color; import java.util.Objects; diff --git a/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResource.java b/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResource.java index cf8a7f1..4ae24fe 100644 --- a/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResource.java +++ b/src/main/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResource.java @@ -15,13 +15,13 @@ */ package org.terasology.web.resources.onlinePlayers; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.entitySystem.event.ReceiveEvent; -import org.terasology.entitySystem.systems.RegisterSystem; -import org.terasology.network.NetworkSystem; -import org.terasology.network.events.ConnectedEvent; -import org.terasology.network.events.DisconnectedEvent; -import org.terasology.registry.In; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.entitySystem.event.ReceiveEvent; +import org.terasology.engine.entitySystem.systems.RegisterSystem; +import org.terasology.engine.network.NetworkSystem; +import org.terasology.engine.network.events.ConnectedEvent; +import org.terasology.engine.network.events.DisconnectedEvent; +import org.terasology.engine.registry.In; import org.terasology.web.resources.DefaultComponentSystem; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.AbstractSimpleResource; diff --git a/src/main/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResource.java b/src/main/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResource.java index 5994a02..64eeebd 100644 --- a/src/main/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResource.java +++ b/src/main/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResource.java @@ -15,14 +15,14 @@ */ package org.terasology.web.resources.worldGenerators; -import org.terasology.registry.In; -import org.terasology.web.resources.base.ResourceAccessException; +import org.terasology.engine.registry.In; +import org.terasology.engine.world.generator.internal.WorldGeneratorInfo; +import org.terasology.engine.world.generator.internal.WorldGeneratorManager; import org.terasology.web.resources.base.AbstractSimpleResource; import org.terasology.web.resources.base.ClientSecurityRequirements; +import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourceMethod; import org.terasology.web.resources.base.ResourcePath; -import org.terasology.world.generator.internal.WorldGeneratorInfo; -import org.terasology.world.generator.internal.WorldGeneratorManager; import java.util.List; diff --git a/src/main/java/org/terasology/web/resources/worldMap/WorldMapInput.java b/src/main/java/org/terasology/web/resources/worldMap/WorldMapInput.java index 7af0848..baccbec 100644 --- a/src/main/java/org/terasology/web/resources/worldMap/WorldMapInput.java +++ b/src/main/java/org/terasology/web/resources/worldMap/WorldMapInput.java @@ -15,7 +15,8 @@ */ package org.terasology.web.resources.worldMap; -import org.terasology.math.geom.Vector3i; + +import org.joml.Vector3i; /** * This class defines the data format that is sent from the frontend for use in {@link WorldMapResource}. diff --git a/src/main/java/org/terasology/web/resources/worldMap/WorldMapResource.java b/src/main/java/org/terasology/web/resources/worldMap/WorldMapResource.java index 97ad0a9..49e7097 100644 --- a/src/main/java/org/terasology/web/resources/worldMap/WorldMapResource.java +++ b/src/main/java/org/terasology/web/resources/worldMap/WorldMapResource.java @@ -15,28 +15,29 @@ */ package org.terasology.web.resources.worldMap; +import org.joml.Vector3f; +import org.joml.Vector3i; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.assets.ResourceUrn; -import org.terasology.entitySystem.entity.EntityManager; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.logic.location.LocationComponent; +import org.terasology.engine.entitySystem.entity.EntityManager; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.logic.location.LocationComponent; +import org.terasology.engine.registry.In; +import org.terasology.engine.utilities.Assets; +import org.terasology.engine.world.RelevanceRegionComponent; +import org.terasology.engine.world.WorldProvider; +import org.terasology.engine.world.block.Block; +import org.terasology.engine.world.block.tiles.BlockTile; +import org.terasology.engine.world.chunks.Chunks; import org.terasology.math.TeraMath; -import org.terasology.math.geom.Vector3i; -import org.terasology.network.Client; -import org.terasology.registry.In; -import org.terasology.utilities.Assets; +import org.terasology.engine.network.Client; import org.terasology.web.resources.base.AbstractSimpleResource; import org.terasology.web.resources.base.ClientSecurityRequirements; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourceMethod; import org.terasology.web.resources.base.ResourcePath; import org.terasology.web.serverAdminManagement.ServerAdminsManager; -import org.terasology.world.RelevanceRegionComponent; -import org.terasology.world.WorldProvider; -import org.terasology.world.block.Block; -import org.terasology.world.block.tiles.BlockTile; -import org.terasology.world.chunks.ChunkConstants; import javax.imageio.ImageIO; import java.awt.Color; @@ -96,8 +97,8 @@ private String getWorldMapBase64ImageString(Vector3i center, int mapBlockWidth, mapLoadingRef = loadChunks(center, mapBlockWidth, mapBlockLength); } - for (int x = (int) Math.floor((double) center.getX() - mapBlockWidth / 2); x < (int) Math.ceil((double) mapBlockWidth / 2 + center.getX()); ++x) { - for (int z = (int) Math.floor((double) center.getZ() - mapBlockLength / 2); z < (int) Math.ceil((double) mapBlockLength / 2 + center.getZ()); ++z) { + for (int x = (int) Math.floor((double) center.x() - mapBlockWidth / 2); x < (int) Math.ceil((double) mapBlockWidth / 2 + center.x()); ++x) { + for (int z = (int) Math.floor((double) center.z() - mapBlockLength / 2); z < (int) Math.ceil((double) mapBlockLength / 2 + center.z()); ++z) { while (worldProvider.getBlock(x, blockY, z).getURI().toString().equals("engine:unloaded")) { try { Thread.sleep(1000); @@ -106,15 +107,15 @@ private String getWorldMapBase64ImageString(Vector3i center, int mapBlockWidth, } } mapLoadingRef.destroy(); - blockY = isSurface ? getSurfaceY(x, blockY, z) : center.getY(); + blockY = isSurface ? getSurfaceY(x, blockY, z) : center.y(); Block block = worldProvider.getBlock(x, blockY, z); ResourceUrn blockUrn = block.getURI().getBlockFamilyDefinitionUrn(); if (Assets.get(blockUrn, BlockTile.class).isPresent()) { BufferedImage blockImage = Assets.get(blockUrn, BlockTile.class).get().getImage(); - colors.get(x - (center.getX() - mapBlockWidth / 2)).add(new Color(getColorOfTexture(blockImage, blockY))); + colors.get(x - (center.x() - mapBlockWidth / 2)).add(new Color(getColorOfTexture(blockImage, blockY))); } else { logger.warn("cannot find texture of block " + blockUrn.toString()); - colors.get(x - (center.getX() - mapBlockWidth / 2)).add(Color.BLACK); + colors.get(x - (center.x() - mapBlockWidth / 2)).add(Color.BLACK); } } } @@ -233,10 +234,10 @@ private static boolean isIgnoredByMap(Block block) { EntityRef loadChunks(Vector3i center, int mapBlockWidth, int mapBlockLength) { final int maximumVerticalChunks = 8; LocationComponent locationComponent = new LocationComponent(); - locationComponent.setWorldPosition(center.toVector3f()); + locationComponent.setWorldPosition(new Vector3f(center)); RelevanceRegionComponent relevanceRegionComponent = new RelevanceRegionComponent(); - relevanceRegionComponent.distance = new Vector3i(((int) Math.ceil((double) mapBlockWidth / ChunkConstants.SIZE_X) * 2) + 2, maximumVerticalChunks, - ((int) Math.ceil((double) mapBlockLength / ChunkConstants.SIZE_Z) * 2) + 2); + relevanceRegionComponent.distance = new Vector3i(((int) Math.ceil((double) mapBlockWidth / Chunks.SIZE_X) * 2) + 2, maximumVerticalChunks, + ((int) Math.ceil((double) mapBlockLength / Chunks.SIZE_Z) * 2) + 2); return entityManager.create(locationComponent, relevanceRegionComponent); } diff --git a/src/main/java/org/terasology/web/serverAdminManagement/AdminPermissionManager.java b/src/main/java/org/terasology/web/serverAdminManagement/AdminPermissionManager.java index 7a8c9c8..c962aa4 100644 --- a/src/main/java/org/terasology/web/serverAdminManagement/AdminPermissionManager.java +++ b/src/main/java/org/terasology/web/serverAdminManagement/AdminPermissionManager.java @@ -19,13 +19,13 @@ import com.google.gson.reflect.TypeToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.engine.paths.PathManager; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.logic.permission.PermissionManager; -import org.terasology.network.Client; -import org.terasology.network.ClientComponent; -import org.terasology.network.NetworkSystem; -import org.terasology.registry.In; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.logic.permission.PermissionManager; +import org.terasology.engine.network.Client; +import org.terasology.engine.network.ClientComponent; +import org.terasology.engine.network.NetworkSystem; +import org.terasology.engine.registry.In; import org.terasology.web.resources.DefaultComponentSystem; import java.io.IOException; diff --git a/src/main/java/org/terasology/web/serverAdminManagement/PermissionType.java b/src/main/java/org/terasology/web/serverAdminManagement/PermissionType.java index 347fcf3..e0bb66a 100644 --- a/src/main/java/org/terasology/web/serverAdminManagement/PermissionType.java +++ b/src/main/java/org/terasology/web/serverAdminManagement/PermissionType.java @@ -15,7 +15,7 @@ */ package org.terasology.web.serverAdminManagement; -import org.terasology.logic.permission.PermissionManager; +import org.terasology.engine.logic.permission.PermissionManager; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminListUpdaterSystem.java b/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminListUpdaterSystem.java index d1784bb..5600a5c 100644 --- a/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminListUpdaterSystem.java +++ b/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminListUpdaterSystem.java @@ -15,10 +15,10 @@ */ package org.terasology.web.serverAdminManagement; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.entitySystem.event.ReceiveEvent; -import org.terasology.entitySystem.systems.BaseComponentSystem; -import org.terasology.network.events.ConnectedEvent; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.entitySystem.event.ReceiveEvent; +import org.terasology.engine.entitySystem.systems.BaseComponentSystem; +import org.terasology.engine.network.events.ConnectedEvent; /** * This class serves as an abstraction layer between ServerAdminsManager and other classes. diff --git a/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminsManager.java b/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminsManager.java index 21919c3..053a446 100644 --- a/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminsManager.java +++ b/src/main/java/org/terasology/web/serverAdminManagement/ServerAdminsManager.java @@ -18,7 +18,7 @@ import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.engine.paths.PathManager; +import org.terasology.engine.core.paths.PathManager; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/org/terasology/web/servlet/AboutServlet.java b/src/main/java/org/terasology/web/servlet/AboutServlet.java index dccf1dd..9ef7d98 100644 --- a/src/main/java/org/terasology/web/servlet/AboutServlet.java +++ b/src/main/java/org/terasology/web/servlet/AboutServlet.java @@ -24,7 +24,6 @@ import org.glassfish.jersey.server.mvc.Viewable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.web.version.VersionInfo; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/org/terasology/web/servlet/LogServlet.java b/src/main/java/org/terasology/web/servlet/LogServlet.java index 907faa5..f27fdac 100644 --- a/src/main/java/org/terasology/web/servlet/LogServlet.java +++ b/src/main/java/org/terasology/web/servlet/LogServlet.java @@ -24,10 +24,8 @@ import org.glassfish.jersey.server.mvc.Viewable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.terasology.web.version.VersionInfo; import com.google.common.collect.ImmutableMap; - /** * Show the log html page. */ diff --git a/src/test/java/org/terasology/web/io/JsonSessionTest.java b/src/test/java/org/terasology/web/io/JsonSessionTest.java index 2f05e86..9e5965d 100644 --- a/src/test/java/org/terasology/web/io/JsonSessionTest.java +++ b/src/test/java/org/terasology/web/io/JsonSessionTest.java @@ -20,12 +20,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonNull; import org.junit.Test; -import org.terasology.entitySystem.entity.EntityManager; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.identity.PublicIdentityCertificate; -import org.terasology.identity.storageServiceClient.BigIntegerBase64Serializer; -import org.terasology.network.ClientComponent; -import org.terasology.network.ClientInfoComponent; +import org.terasology.engine.entitySystem.entity.EntityManager; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.identity.PublicIdentityCertificate; +import org.terasology.engine.identity.storageServiceClient.BigIntegerBase64Serializer; +import org.terasology.engine.network.ClientComponent; +import org.terasology.engine.network.ClientInfoComponent; import org.terasology.web.EngineRunner; import org.terasology.web.authentication.AuthenticationFailedException; import org.terasology.web.authentication.AuthenticationHandshakeHandler; diff --git a/src/test/java/org/terasology/web/resources/console/ConsoleResourceTest.java b/src/test/java/org/terasology/web/resources/console/ConsoleResourceTest.java index 2ab70a6..3f04279 100644 --- a/src/test/java/org/terasology/web/resources/console/ConsoleResourceTest.java +++ b/src/test/java/org/terasology/web/resources/console/ConsoleResourceTest.java @@ -29,7 +29,7 @@ import org.terasology.logic.console.MessageEvent; import org.terasology.logic.console.commandSystem.MethodCommand; import org.terasology.logic.console.commands.ServerCommands; -import org.terasology.network.Client; +import org.terasology.engine.network.Client; import org.terasology.network.ClientComponent; import org.terasology.network.NetworkMode; import org.terasology.network.NetworkSystem; diff --git a/src/test/java/org/terasology/web/resources/engineState/EngineStateResourceTest.java b/src/test/java/org/terasology/web/resources/engineState/EngineStateResourceTest.java index 552fc3a..ea6718c 100644 --- a/src/test/java/org/terasology/web/resources/engineState/EngineStateResourceTest.java +++ b/src/test/java/org/terasology/web/resources/engineState/EngineStateResourceTest.java @@ -17,10 +17,10 @@ import org.junit.Before; import org.junit.Test; -import org.terasology.context.Context; -import org.terasology.engine.GameEngine; -import org.terasology.engine.modes.GameState; -import org.terasology.registry.InjectionHelper; +import org.terasology.engine.context.Context; +import org.terasology.engine.core.GameEngine; +import org.terasology.engine.core.modes.GameState; +import org.terasology.engine.registry.InjectionHelper; import org.terasology.web.StateEngineIdle; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourcePath; diff --git a/src/test/java/org/terasology/web/resources/games/DeleteGameMethodTest.java b/src/test/java/org/terasology/web/resources/games/DeleteGameMethodTest.java index 9fa68fc..7ba0778 100644 --- a/src/test/java/org/terasology/web/resources/games/DeleteGameMethodTest.java +++ b/src/test/java/org/terasology/web/resources/games/DeleteGameMethodTest.java @@ -19,7 +19,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.terasology.engine.paths.PathManager; +import org.terasology.engine.core.paths.PathManager; import org.terasology.web.resources.base.ResourceAccessException; import java.io.IOException; diff --git a/src/test/java/org/terasology/web/resources/games/GamesBackupResourceTest.java b/src/test/java/org/terasology/web/resources/games/GamesBackupResourceTest.java index e3dad0e..8354914 100644 --- a/src/test/java/org/terasology/web/resources/games/GamesBackupResourceTest.java +++ b/src/test/java/org/terasology/web/resources/games/GamesBackupResourceTest.java @@ -19,8 +19,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourcePath; diff --git a/src/test/java/org/terasology/web/resources/games/NewGameMethodTest.java b/src/test/java/org/terasology/web/resources/games/NewGameMethodTest.java index 1c8d1a1..5a1e8c6 100644 --- a/src/test/java/org/terasology/web/resources/games/NewGameMethodTest.java +++ b/src/test/java/org/terasology/web/resources/games/NewGameMethodTest.java @@ -20,9 +20,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.terasology.engine.SimpleUri; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; +import org.terasology.engine.core.SimpleUri; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; +import org.terasology.engine.world.internal.WorldInfo; import org.terasology.module.DependencyResolver; import org.terasology.module.Module; import org.terasology.module.ResolutionResult; @@ -30,7 +31,6 @@ import org.terasology.naming.NameVersion; import org.terasology.naming.Version; import org.terasology.web.resources.base.ResourceAccessException; -import org.terasology.world.internal.WorldInfo; import java.io.IOException; import java.nio.file.Files; diff --git a/src/test/java/org/terasology/web/resources/games/PatchGameMethodTest.java b/src/test/java/org/terasology/web/resources/games/PatchGameMethodTest.java index 054f464..29a83ae 100644 --- a/src/test/java/org/terasology/web/resources/games/PatchGameMethodTest.java +++ b/src/test/java/org/terasology/web/resources/games/PatchGameMethodTest.java @@ -19,8 +19,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.terasology.engine.paths.PathManager; -import org.terasology.game.GameManifest; +import org.terasology.engine.core.paths.PathManager; +import org.terasology.engine.game.GameManifest; import org.terasology.web.resources.base.ResourceAccessException; import java.io.IOException; diff --git a/src/test/java/org/terasology/web/resources/modules/AvailableModulesResourceTest.java b/src/test/java/org/terasology/web/resources/modules/AvailableModulesResourceTest.java index 8afd564..1d7e793 100644 --- a/src/test/java/org/terasology/web/resources/modules/AvailableModulesResourceTest.java +++ b/src/test/java/org/terasology/web/resources/modules/AvailableModulesResourceTest.java @@ -18,15 +18,15 @@ import com.google.common.collect.ImmutableSet; import org.junit.Before; import org.junit.Test; -import org.terasology.context.Context; -import org.terasology.engine.module.ModuleManager; +import org.terasology.engine.context.Context; +import org.terasology.engine.core.module.ModuleManager; +import org.terasology.engine.registry.InjectionHelper; import org.terasology.i18n.I18nMap; import org.terasology.module.Module; import org.terasology.module.ModuleMetadata; import org.terasology.module.ModuleRegistry; import org.terasology.naming.Name; import org.terasology.naming.Version; -import org.terasology.registry.InjectionHelper; import org.terasology.web.resources.base.ResourceAccessException; import java.util.List; diff --git a/src/test/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResourceTest.java b/src/test/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResourceTest.java index 719af1a..db91963 100644 --- a/src/test/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResourceTest.java +++ b/src/test/java/org/terasology/web/resources/onlinePlayers/OnlinePlayersResourceTest.java @@ -16,15 +16,15 @@ package org.terasology.web.resources.onlinePlayers; import org.junit.Test; -import org.terasology.context.Context; -import org.terasology.context.internal.ContextImpl; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.network.Client; -import org.terasology.network.NetworkSystem; -import org.terasology.network.events.ConnectedEvent; -import org.terasology.network.events.DisconnectedEvent; -import org.terasology.registry.InjectionHelper; -import org.terasology.rendering.nui.Color; +import org.terasology.engine.context.Context; +import org.terasology.engine.context.internal.ContextImpl; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.network.Client; +import org.terasology.engine.network.NetworkSystem; +import org.terasology.engine.network.events.ConnectedEvent; +import org.terasology.engine.network.events.DisconnectedEvent; +import org.terasology.engine.registry.InjectionHelper; +import org.terasology.nui.Color; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourceObserver; import org.terasology.web.resources.base.ResourcePath; diff --git a/src/test/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResourceTest.java b/src/test/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResourceTest.java index 767b63c..3099354 100644 --- a/src/test/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResourceTest.java +++ b/src/test/java/org/terasology/web/resources/worldGenerators/AvailableWorldGeneratorsResourceTest.java @@ -16,13 +16,13 @@ package org.terasology.web.resources.worldGenerators; import org.junit.Test; -import org.terasology.context.Context; -import org.terasology.engine.SimpleUri; -import org.terasology.registry.InjectionHelper; +import org.terasology.engine.context.Context; +import org.terasology.engine.core.SimpleUri; +import org.terasology.engine.registry.InjectionHelper; +import org.terasology.engine.world.generator.internal.WorldGeneratorInfo; +import org.terasology.engine.world.generator.internal.WorldGeneratorManager; import org.terasology.web.resources.base.ResourceAccessException; import org.terasology.web.resources.base.ResourcePath; -import org.terasology.world.generator.internal.WorldGeneratorInfo; -import org.terasology.world.generator.internal.WorldGeneratorManager; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/terasology/web/resources/worldMap/WorldMapResourceTest.java b/src/test/java/org/terasology/web/resources/worldMap/WorldMapResourceTest.java index 4b618ac..55deddd 100644 --- a/src/test/java/org/terasology/web/resources/worldMap/WorldMapResourceTest.java +++ b/src/test/java/org/terasology/web/resources/worldMap/WorldMapResourceTest.java @@ -16,16 +16,16 @@ package org.terasology.web.resources.worldMap; import org.codehaus.plexus.util.Base64; +import org.joml.Vector3i; import org.junit.Before; import org.junit.Test; -import org.terasology.context.Context; -import org.terasology.context.internal.ContextImpl; -import org.terasology.entitySystem.entity.EntityManager; -import org.terasology.logic.location.LocationComponent; -import org.terasology.math.geom.Vector3i; -import org.terasology.registry.InjectionHelper; -import org.terasology.world.RelevanceRegionComponent; -import org.terasology.world.WorldProvider; +import org.terasology.engine.context.Context; +import org.terasology.engine.context.internal.ContextImpl; +import org.terasology.engine.entitySystem.entity.EntityManager; +import org.terasology.engine.logic.location.LocationComponent; +import org.terasology.engine.registry.InjectionHelper; +import org.terasology.engine.world.RelevanceRegionComponent; +import org.terasology.engine.world.WorldProvider; import java.awt.Graphics2D; import java.awt.Color; diff --git a/src/test/java/org/terasology/web/serverAdminManagement/AdminPermissionManagerTest.java b/src/test/java/org/terasology/web/serverAdminManagement/AdminPermissionManagerTest.java index 669b6b2..edac463 100644 --- a/src/test/java/org/terasology/web/serverAdminManagement/AdminPermissionManagerTest.java +++ b/src/test/java/org/terasology/web/serverAdminManagement/AdminPermissionManagerTest.java @@ -18,13 +18,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.terasology.context.Context; -import org.terasology.context.internal.ContextImpl; -import org.terasology.entitySystem.entity.EntityManager; -import org.terasology.entitySystem.entity.EntityRef; -import org.terasology.logic.permission.PermissionManager; -import org.terasology.network.ClientComponent; -import org.terasology.registry.InjectionHelper; +import org.terasology.engine.context.Context; +import org.terasology.engine.context.internal.ContextImpl; +import org.terasology.engine.entitySystem.entity.EntityManager; +import org.terasology.engine.entitySystem.entity.EntityRef; +import org.terasology.engine.logic.permission.PermissionManager; +import org.terasology.engine.network.ClientComponent; +import org.terasology.engine.registry.InjectionHelper; import java.io.IOException; import java.nio.file.Path;