From 34868b1ff7946aff64b1e8e023d10d0230ac88ef Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sat, 3 Apr 2021 08:53:52 -0700 Subject: [PATCH] chore: migrate gestalt v7 PR: https://github.com/MovingBlocks/Terasology/pull/4593 --- .../scenario/internal/systems/ActionEventSystem.java | 2 +- .../scenario/internal/systems/ConvertIntoEntitySystem.java | 2 +- .../scenario/internal/systems/EntityTreeSystem.java | 2 +- .../terasology/scenario/internal/systems/RegionSystem.java | 2 +- .../scenario/internal/systems/RegionTreeSystem.java | 4 ++-- .../org/terasology/scenario/internal/ui/EditLogicScreen.java | 4 ++-- .../terasology/scenario/internal/ui/EditParameterScreen.java | 4 ++-- .../org/terasology/scenario/internal/ui/EditRegionScreen.java | 2 +- .../org/terasology/scenario/internal/ui/HubToolScreen.java | 2 +- .../scenario/internal/ui/LogicTree/LogicTreeView.java | 2 +- .../scenario/internal/utilities/ArgumentParser.java | 2 +- 11 files changed, 14 insertions(+), 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 index b4c7360..fd30fb5 100644 --- 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 index 4e91609..69a80d3 100644 --- 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 index 1b4f7a4..577f298 100644 --- 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 index c5cd84b..e6fa478 100644 --- 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 index 346747c..5b193b1 100644 --- 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 scenario = entityManager.getEntitiesWith(ScenarioComponent.class); + Iterable 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 index 6088ab4..7c9fb76 100644 --- 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 index 2762b8d..b7a1720 100644 --- 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 index 6e8a40f..95f4ced 100644 --- 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 index 7c81942..8b81fa1 100644 --- 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 index 4ac9824..83c9a07 100644 --- 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 index 56fe207..0586591 100644 --- 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;