From 89c1907adb1e274d0747da30b038b18bee66c81c Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sat, 3 Apr 2021 08:53:07 -0700 Subject: [PATCH] chore: migrate gestalt v7 PR: https://github.com/MovingBlocks/Terasology/pull/4593 --- .../entityNetwork/systems/EntityNetworkCommonSystem.java | 2 +- .../fluidTransport/systems/FluidTankClientSystem.java | 2 +- .../processParts/RequirementInputProcessPartCommonSystem.java | 2 +- .../machines/world/SameNetworkByBlockBlockFamily.java | 2 +- .../org/terasology/machines/world/SurfacePlacementFamily.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java b/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java index b2d89f5..bd83fab 100644 --- a/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java +++ b/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java @@ -7,7 +7,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -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.entity.lifecycleEvents.BeforeDeactivateComponent; diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java index 743e34e..5e8b0d6 100644 --- a/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java +++ b/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java @@ -6,7 +6,7 @@ import org.joml.Vector3f; import org.joml.Vector3fc; import org.joml.Vector3i; -import org.terasology.assets.ResourceUrn; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityManager; import org.terasology.engine.entitySystem.entity.EntityRef; diff --git a/src/main/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java b/src/main/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java index f89be11..fa2ccc9 100644 --- a/src/main/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java +++ b/src/main/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java @@ -3,7 +3,7 @@ package org.terasology.machines.processParts; import com.google.common.collect.Lists; -import org.terasology.assets.ResourceUrn; +import org.terasology.gestalt.assets.ResourceUrn; import org.terasology.engine.core.Time; import org.terasology.engine.entitySystem.entity.EntityBuilder; import org.terasology.engine.entitySystem.entity.EntityManager; diff --git a/src/main/java/org/terasology/machines/world/SameNetworkByBlockBlockFamily.java b/src/main/java/org/terasology/machines/world/SameNetworkByBlockBlockFamily.java index a70311b..722ff54 100644 --- a/src/main/java/org/terasology/machines/world/SameNetworkByBlockBlockFamily.java +++ b/src/main/java/org/terasology/machines/world/SameNetworkByBlockBlockFamily.java @@ -21,7 +21,7 @@ import org.terasology.entityNetwork.Network; import org.terasology.entityNetwork.NetworkNode; import org.terasology.entityNetwork.systems.EntityNetworkManager; -import org.terasology.naming.Name; +import org.terasology.gestalt.naming.Name; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/org/terasology/machines/world/SurfacePlacementFamily.java b/src/main/java/org/terasology/machines/world/SurfacePlacementFamily.java index 790c658..2b7ce00 100644 --- a/src/main/java/org/terasology/machines/world/SurfacePlacementFamily.java +++ b/src/main/java/org/terasology/machines/world/SurfacePlacementFamily.java @@ -18,7 +18,7 @@ import org.terasology.engine.world.block.family.RegisterBlockFamily; import org.terasology.engine.world.block.family.SideDefinedBlockFamily; import org.terasology.engine.world.block.loader.BlockFamilyDefinition; -import org.terasology.naming.Name; +import org.terasology.gestalt.naming.Name; import java.util.ArrayList; import java.util.Locale;