chore: update engine package paths for MovingBlocks/Terasology#4560

Terasology-Archived · Mar 7, 2021 · 4bdc7b3 · 4bdc7b3
1 parent 1d2237c
commit 4bdc7b3
Show file tree

Hide file tree

Showing 26 changed files with 110 additions and 110 deletions.
diff --git a/README.markdown b/README.markdown
@@ -261,7 +261,7 @@ Each tick, the `update` methods is called for all active tasks.
 ## Example Node and Task
 
 <pre>
-import org.terasology.rendering.nui.properties.Range;
+import org.terasology.engine.rendering.nui.properties.Range;
 
 public class TimerNode extends DecoratorNode {
     @Range(min = 0, max = 20)

diff --git a/src/main/java/org/terasology/navgraph/Floor.java b/src/main/java/org/terasology/navgraph/Floor.java
@@ -4,7 +4,7 @@
 
 import com.google.common.collect.Lists;
 import org.joml.Vector3i;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.Chunks;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/src/main/java/org/terasology/navgraph/NavGraphChanged.java b/src/main/java/org/terasology/navgraph/NavGraphChanged.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.navgraph;
 
-import org.terasology.entitySystem.event.Event;
+import org.terasology.engine.entitySystem.event.Event;
 
 /**
  * Created by synopia on 02.02.14.

diff --git a/src/main/java/org/terasology/navgraph/NavGraphChunk.java b/src/main/java/org/terasology/navgraph/NavGraphChunk.java
@@ -7,8 +7,8 @@
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
 import org.terasology.pathfinding.model.PathCache;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.chunks.Chunks;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.chunks.Chunks;
 
 import java.util.List;
 import java.util.Set;

diff --git a/src/main/java/org/terasology/navgraph/NavGraphSystem.java b/src/main/java/org/terasology/navgraph/NavGraphSystem.java
@@ -7,23 +7,23 @@
 import org.joml.Vector3fc;
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
-import org.terasology.entitySystem.entity.EntityManager;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.event.ReceiveEvent;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.UpdateSubscriberSystem;
-import org.terasology.logic.location.LocationComponent;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
-import org.terasology.utilities.concurrency.Task;
-import org.terasology.utilities.concurrency.TaskMaster;
-import org.terasology.world.WorldChangeListener;
-import org.terasology.world.WorldComponent;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.event.OnChunkLoaded;
+import org.terasology.engine.entitySystem.entity.EntityManager;
+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.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
+import org.terasology.engine.logic.location.LocationComponent;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.utilities.concurrency.Task;
+import org.terasology.engine.utilities.concurrency.TaskMaster;
+import org.terasology.engine.world.WorldChangeListener;
+import org.terasology.engine.world.WorldComponent;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.event.OnChunkLoaded;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/org/terasology/navgraph/WalkableBlockFinder.java b/src/main/java/org/terasology/navgraph/WalkableBlockFinder.java
@@ -4,8 +4,8 @@
 
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
 
 /**
  * @author synopia

diff --git a/src/main/java/org/terasology/pathfinding/PathfinderTestGenerator.java b/src/main/java/org/terasology/pathfinding/PathfinderTestGenerator.java
@@ -4,15 +4,15 @@
 
 import org.terasology.assets.ResourceUrn;
 import org.terasology.assets.management.AssetManager;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.family.SymmetricFamily;
-import org.terasology.world.block.loader.BlockFamilyDefinition;
-import org.terasology.world.block.loader.BlockFamilyDefinitionData;
-import org.terasology.world.chunks.Chunks;
-import org.terasology.world.chunks.CoreChunk;
-import org.terasology.world.generator.ChunkGenerationPass;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.family.SymmetricFamily;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinition;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinitionData;
+import org.terasology.engine.world.chunks.Chunks;
+import org.terasology.engine.world.chunks.CoreChunk;
+import org.terasology.engine.world.generator.ChunkGenerationPass;
 
 import java.util.Map;
 

diff --git a/src/main/java/org/terasology/pathfinding/PathfinderTestWorldMapGenerator.java b/src/main/java/org/terasology/pathfinding/PathfinderTestWorldMapGenerator.java
@@ -5,12 +5,12 @@
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
 import org.terasology.core.world.generator.facetProviders.FlatSurfaceHeightProvider;
 import org.terasology.core.world.generator.facetProviders.SeaLevelProvider;
-import org.terasology.engine.SimpleUri;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.generation.World;
-import org.terasology.world.generation.WorldBuilder;
-import org.terasology.world.generator.RegisterWorldGenerator;
-import org.terasology.world.generator.plugin.WorldGeneratorPluginLibrary;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.generation.World;
+import org.terasology.engine.world.generation.WorldBuilder;
+import org.terasology.engine.world.generator.RegisterWorldGenerator;
+import org.terasology.engine.world.generator.plugin.WorldGeneratorPluginLibrary;
 
 /**
  * @author synopia

diff --git a/src/main/java/org/terasology/pathfinding/componentSystem/PathRenderSystem.java b/src/main/java/org/terasology/pathfinding/componentSystem/PathRenderSystem.java
@@ -3,15 +3,15 @@
 package org.terasology.pathfinding.componentSystem;
 
 import com.google.common.collect.Lists;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
-import org.terasology.entitySystem.systems.RenderSystem;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.RenderSystem;
 import org.terasology.navgraph.WalkableBlock;
 import org.terasology.pathfinding.model.Path;
-import org.terasology.registry.Share;
-import org.terasology.rendering.world.selection.BlockSelectionRenderer;
-import org.terasology.utilities.Assets;
+import org.terasology.engine.registry.Share;
+import org.terasology.engine.rendering.world.selection.BlockSelectionRenderer;
+import org.terasology.engine.utilities.Assets;
 
 import java.util.List;
 

diff --git a/src/main/java/org/terasology/pathfinding/componentSystem/PathfinderSystem.java b/src/main/java/org/terasology/pathfinding/componentSystem/PathfinderSystem.java
@@ -8,19 +8,19 @@
 import org.joml.Vector3i;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.entitySystem.entity.EntityRef;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterMode;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.entity.EntityRef;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterMode;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.navgraph.NavGraphSystem;
 import org.terasology.navgraph.WalkableBlock;
 import org.terasology.pathfinding.model.LineOfSight;
 import org.terasology.pathfinding.model.LineOfSight2d;
 import org.terasology.pathfinding.model.Path;
 import org.terasology.pathfinding.model.Pathfinder;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.registry.In;
-import org.terasology.registry.Share;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.registry.Share;
 
 import java.util.List;
 

diff --git a/src/main/java/org/terasology/pathfinding/model/LineOfSight.java b/src/main/java/org/terasology/pathfinding/model/LineOfSight.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.pathfinding.model;
 
-import org.terasology.entitySystem.systems.ComponentSystem;
+import org.terasology.engine.entitySystem.systems.ComponentSystem;
 import org.terasology.navgraph.WalkableBlock;
 
 /**

diff --git a/src/main/java/org/terasology/pathfinding/model/LineOfSight2d.java b/src/main/java/org/terasology/pathfinding/model/LineOfSight2d.java
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.pathfinding.model;
 
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.navgraph.WalkableBlock;
 
 /**

diff --git a/src/main/java/org/terasology/pathfinding/model/LineOfSight3d.java b/src/main/java/org/terasology/pathfinding/model/LineOfSight3d.java
@@ -3,12 +3,12 @@
 package org.terasology.pathfinding.model;
 
 import org.joml.Vector3i;
-import org.terasology.entitySystem.systems.BaseComponentSystem;
-import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.navgraph.WalkableBlock;
-import org.terasology.registry.In;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
+import org.terasology.engine.registry.In;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
 
 /**
  * Created by synopia on 01.02.14.

diff --git a/src/test/java/org/terasology/TextWorldBuilder.java b/src/test/java/org/terasology/TextWorldBuilder.java
@@ -5,13 +5,13 @@
 import org.joml.Vector3i;
 import org.terasology.assets.ResourceUrn;
 import org.terasology.assets.management.AssetManager;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
-import org.terasology.world.block.Block;
-import org.terasology.world.block.BlockManager;
-import org.terasology.world.block.family.SymmetricFamily;
-import org.terasology.world.block.loader.BlockFamilyDefinition;
-import org.terasology.world.block.loader.BlockFamilyDefinitionData;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
+import org.terasology.engine.world.block.Block;
+import org.terasology.engine.world.block.BlockManager;
+import org.terasology.engine.world.block.family.SymmetricFamily;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinition;
+import org.terasology.engine.world.block.loader.BlockFamilyDefinitionData;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/test/java/org/terasology/navgraph/ConnectNavGraphChunkTest.java b/src/test/java/org/terasology/navgraph/ConnectNavGraphChunkTest.java
@@ -8,11 +8,11 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
 import org.terasology.naming.Name;
 import org.terasology.pathfinding.PathfinderTestGenerator;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/test/java/org/terasology/navgraph/ContourFinderTest.java b/src/test/java/org/terasology/navgraph/ContourFinderTest.java
@@ -8,10 +8,10 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
 import org.terasology.naming.Name;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 /**
  * @author synopia

diff --git a/src/test/java/org/terasology/navgraph/FloorFinderTest.java b/src/test/java/org/terasology/navgraph/FloorFinderTest.java
@@ -8,10 +8,10 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
 import org.terasology.naming.Name;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/test/java/org/terasology/navgraph/RegionFinderTest.java b/src/test/java/org/terasology/navgraph/RegionFinderTest.java
@@ -8,10 +8,10 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
 import org.terasology.naming.Name;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/test/java/org/terasology/navgraph/WalkableBlockFinderTest.java b/src/test/java/org/terasology/navgraph/WalkableBlockFinderTest.java
@@ -8,10 +8,10 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
+import org.terasology.engine.core.SimpleUri;
 import org.terasology.naming.Name;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

diff --git a/src/test/java/org/terasology/pathfinding/AStarTest.java b/src/test/java/org/terasology/pathfinding/AStarTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.core.paths.PathManager;
 import org.terasology.navgraph.BitMap;
 import org.terasology.pathfinding.model.AStar;
 

diff --git a/src/test/java/org/terasology/pathfinding/GeneralPathFinderTest.java b/src/test/java/org/terasology/pathfinding/GeneralPathFinderTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.core.paths.PathManager;
 import org.terasology.pathfinding.GeneralPathFinder.DefaultEdge;
 import org.terasology.pathfinding.GeneralPathFinder.Edge;
 import org.terasology.pathfinding.GeneralPathFinder.Path;

diff --git a/src/test/java/org/terasology/pathfinding/HAStarLoSTest.java b/src/test/java/org/terasology/pathfinding/HAStarLoSTest.java
@@ -10,15 +10,15 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.paths.PathManager;
 import org.terasology.naming.Name;
 import org.terasology.navgraph.NavGraphChunk;
 import org.terasology.navgraph.WalkableBlock;
 import org.terasology.pathfinding.model.HAStar;
 import org.terasology.pathfinding.model.LineOfSight2d;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/src/test/java/org/terasology/pathfinding/HAStarTest.java b/src/test/java/org/terasology/pathfinding/HAStarTest.java
@@ -10,15 +10,15 @@
 import org.terasology.TextWorldBuilder;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.paths.PathManager;
 import org.terasology.naming.Name;
 import org.terasology.navgraph.NavGraphChunk;
 import org.terasology.navgraph.WalkableBlock;
 import org.terasology.pathfinding.model.HAStar;
 import org.terasology.pathfinding.model.LineOfSight;
-import org.terasology.registry.CoreRegistry;
-import org.terasology.world.WorldProvider;
+import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.world.WorldProvider;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/src/test/java/org/terasology/pathfinding/PathDebugger.java b/src/test/java/org/terasology/pathfinding/PathDebugger.java
@@ -7,9 +7,9 @@
 import org.joml.Vector3i;
 import org.terasology.WorldProvidingHeadlessEnvironment;
 import org.terasology.core.world.generator.AbstractBaseWorldGenerator;
-import org.terasology.engine.ComponentSystemManager;
-import org.terasology.engine.SimpleUri;
-import org.terasology.engine.paths.PathManager;
+import org.terasology.engine.core.ComponentSystemManager;
+import org.terasology.engine.core.SimpleUri;
+import org.terasology.engine.core.paths.PathManager;
 import org.terasology.navgraph.Entrance;
 import org.terasology.navgraph.Floor;
 import org.terasology.navgraph.NavGraphSystem;
@@ -18,7 +18,7 @@
 import org.terasology.pathfinding.model.LineOfSight;
 import org.terasology.pathfinding.model.LineOfSight2d;
 import org.terasology.pathfinding.model.Path;
-import org.terasology.registry.CoreRegistry;
+import org.terasology.engine.registry.CoreRegistry;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;