chore: upgrade to gestalt-module 7.1 from 7.0 MovingBlocks/Terasology…

…#4622
Terasology · May 2, 2021 · 35f7294 · 35f7294
2 parents 55f36e2 + b4dd900
commit 35f7294
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/org/terasology/scenario/internal/systems/ActionEventSystem.java b/src/main/java/org/terasology/scenario/internal/systems/ActionEventSystem.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3f;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;

diff --git a/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java b/src/main/java/org/terasology/scenario/internal/systems/ConvertIntoEntitySystem.java
@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;

diff --git a/src/main/java/org/terasology/scenario/internal/systems/EntityTreeSystem.java b/src/main/java/org/terasology/scenario/internal/systems/EntityTreeSystem.java
@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;

diff --git a/src/main/java/org/terasology/scenario/internal/systems/RegionSystem.java b/src/main/java/org/terasology/scenario/internal/systems/RegionSystem.java
@@ -18,7 +18,7 @@
 import org.joml.Vector3i;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.EventPriority;

diff --git a/src/main/java/org/terasology/scenario/internal/systems/RegionTreeSystem.java b/src/main/java/org/terasology/scenario/internal/systems/RegionTreeSystem.java
@@ -19,7 +19,7 @@
 import org.joml.Vector3f;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
@@ -81,7 +81,7 @@ public class RegionTreeSystem extends BaseComponentSystem {
     @Override
     public void postBegin() {
 		// Checks for existing scenarios
-        Iterable<EntityRef> scenario = entityManager.getEntitiesWith(ScenarioComponent.class); 
+        Iterable<EntityRef> scenario = entityManager.getEntitiesWith(ScenarioComponent.class);
 
         if (!scenario.iterator().hasNext()) { //No scenario exists yet
             scenarioEntity = entityManager.create(assetManager.getAsset("scenario:scenarioEntity", Prefab.class).get());

diff --git a/src/main/java/org/terasology/scenario/internal/ui/EditLogicScreen.java b/src/main/java/org/terasology/scenario/internal/ui/EditLogicScreen.java
@@ -18,8 +18,8 @@
 import org.joml.Vector2i;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.prefab.Prefab;

diff --git a/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java b/src/main/java/org/terasology/scenario/internal/ui/EditParameterScreen.java
@@ -21,8 +21,8 @@
 import org.joml.Vector2i;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.prefab.Prefab;

diff --git a/src/main/java/org/terasology/scenario/internal/ui/EditRegionScreen.java b/src/main/java/org/terasology/scenario/internal/ui/EditRegionScreen.java
@@ -20,7 +20,7 @@
 import com.google.common.math.DoubleMath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.players.LocalPlayer;

diff --git a/src/main/java/org/terasology/scenario/internal/ui/HubToolScreen.java b/src/main/java/org/terasology/scenario/internal/ui/HubToolScreen.java
@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.players.LocalPlayer;

diff --git a/src/main/java/org/terasology/scenario/internal/ui/LogicTree/LogicTreeView.java b/src/main/java/org/terasology/scenario/internal/ui/LogicTree/LogicTreeView.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.scenario.internal.ui.LogicTree;
 
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.rendering.nui.contextMenu.ContextMenuUtils;

diff --git a/src/main/java/org/terasology/scenario/internal/utilities/ArgumentParser.java b/src/main/java/org/terasology/scenario/internal/utilities/ArgumentParser.java
@@ -17,7 +17,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.prefab.Prefab;