From 1fca0c4f741b74e29a9bb4984f548025d7573b3c Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sat, 3 Apr 2021 08:53:28 -0700 Subject: [PATCH] chore: migrate gestalt v7 PR: https://github.com/MovingBlocks/Terasology/pull/4593 --- .../org/terasology/multiBlock2/block/InvisibleBlockUtil.java | 4 ++-- .../block/InvisibleInMultiBlockStructureBlockFamily.java | 4 ++-- .../block/InvisibleInMultiBlockStructureSidedBlockFamily.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/terasology/multiBlock2/block/InvisibleBlockUtil.java b/src/main/java/org/terasology/multiBlock2/block/InvisibleBlockUtil.java index 9cee6db..fdd21ed 100644 --- a/src/main/java/org/terasology/multiBlock2/block/InvisibleBlockUtil.java +++ b/src/main/java/org/terasology/multiBlock2/block/InvisibleBlockUtil.java @@ -16,8 +16,8 @@ package org.terasology.multiBlock2.block; -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.world.block.BlockPart; import org.terasology.engine.world.block.loader.BlockFamilyDefinition; import org.terasology.engine.world.block.loader.SectionDefinitionData; diff --git a/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureBlockFamily.java b/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureBlockFamily.java index 2845cab..be24665 100644 --- a/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureBlockFamily.java +++ b/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureBlockFamily.java @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.multiBlock2.block; -import org.terasology.assets.management.AssetManager; +import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.engine.math.Rotation; import org.terasology.engine.registry.In; import org.terasology.engine.world.block.Block; @@ -14,7 +14,7 @@ import org.terasology.engine.world.block.loader.BlockFamilyDefinition; import org.terasology.engine.world.block.loader.SectionDefinitionData; import org.terasology.engine.world.block.shapes.BlockShape; -import org.terasology.naming.Name; +import org.terasology.gestalt.naming.Name; import java.util.Arrays; diff --git a/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureSidedBlockFamily.java b/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureSidedBlockFamily.java index 503cda4..d0e7f69 100644 --- a/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureSidedBlockFamily.java +++ b/src/main/java/org/terasology/multiBlock2/block/InvisibleInMultiBlockStructureSidedBlockFamily.java @@ -3,7 +3,7 @@ package org.terasology.multiBlock2.block; import com.google.common.collect.Maps; -import org.terasology.assets.management.AssetManager; +import org.terasology.gestalt.assets.management.AssetManager; import org.terasology.engine.math.Rotation; import org.terasology.engine.math.Side; import org.terasology.engine.registry.In; @@ -17,7 +17,7 @@ import org.terasology.engine.world.block.loader.BlockFamilyDefinition; import org.terasology.engine.world.block.loader.SectionDefinitionData; import org.terasology.engine.world.block.shapes.BlockShape; -import org.terasology.naming.Name; +import org.terasology.gestalt.naming.Name; import java.util.HashMap; import java.util.Map;