Skip to content

Commit 8016634

Browse files
committed
chore: migrate gestalt v7
PR: MovingBlocks/Terasology#4593
1 parent 0b56844 commit 8016634

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/main/java/org/terasology/characters/humanoid/CharacterAppearanceClientSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package org.terasology.characters.humanoid;
44

55
import org.joml.Vector3f;
6-
import org.terasology.assets.management.AssetManager;
76
import org.terasology.engine.core.modes.loadProcesses.AwaitedLocalCharacterSpawnEvent;
87
import org.terasology.engine.entitySystem.entity.EntityBuilder;
98
import org.terasology.engine.entitySystem.entity.EntityManager;
@@ -29,6 +28,7 @@
2928
import org.terasology.engine.rendering.assets.material.Material;
3029
import org.terasology.engine.rendering.logic.SkeletalMeshComponent;
3130
import org.terasology.engine.rendering.nui.NUIManager;
31+
import org.terasology.gestalt.assets.management.AssetManager;
3232
import org.terasology.nui.Color;
3333

3434
import java.util.HashMap;

src/main/java/org/terasology/characters/humanoid/CharacterAppearanceScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.google.common.math.DoubleMath;
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
10-
import org.terasology.assets.ResourceUrn;
10+
import org.terasology.gestalt.assets.ResourceUrn;
1111
import org.terasology.engine.entitySystem.entity.EntityManager;
1212
import org.terasology.engine.logic.players.LocalPlayer;
1313
import org.terasology.engine.registry.In;

src/main/java/org/terasology/characters/humanoid/VerticalColorArrayMaterialResolver.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
package org.terasology.characters.humanoid;
1717

1818
import com.google.common.collect.ImmutableSet;
19-
import org.terasology.assets.AssetDataProducer;
20-
import org.terasology.assets.ResourceUrn;
21-
import org.terasology.assets.management.AssetManager;
22-
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
19+
import org.terasology.gestalt.assets.AssetDataProducer;
20+
import org.terasology.gestalt.assets.ResourceUrn;
2321
import org.terasology.engine.rendering.assets.material.MaterialData;
2422
import org.terasology.engine.rendering.assets.shader.Shader;
2523
import org.terasology.engine.rendering.assets.texture.Texture;
26-
import org.terasology.naming.Name;
24+
import org.terasology.gestalt.assets.management.AssetManager;
25+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetDataProducer;
26+
import org.terasology.gestalt.naming.Name;
2727

2828
import java.io.IOException;
2929
import java.util.Collections;

src/main/java/org/terasology/characters/humanoid/VerticalColorArrayTextureResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.terasology.characters.humanoid;
1717

1818
import com.google.common.collect.ImmutableSet;
19-
import org.terasology.assets.AssetDataProducer;
20-
import org.terasology.assets.ResourceUrn;
21-
import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
19+
import org.terasology.gestalt.assets.AssetDataProducer;
20+
import org.terasology.gestalt.assets.ResourceUrn;
2221
import org.terasology.engine.rendering.assets.texture.Texture;
2322
import org.terasology.engine.rendering.assets.texture.TextureData;
2423
import org.terasology.engine.rendering.assets.texture.TextureUtil;
25-
import org.terasology.naming.Name;
24+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetDataProducer;
25+
import org.terasology.gestalt.naming.Name;
2626

2727
import java.awt.Color;
2828
import java.awt.image.BufferedImage;

src/test/java/org/terasology/characters/humanoid/VerticalColorArrayTextureResolverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.terasology.characters.humanoid;
1717

1818
import org.junit.jupiter.api.Test;
19-
import org.terasology.assets.ResourceUrn;
19+
import org.terasology.gestalt.assets.ResourceUrn;
2020
import org.terasology.engine.rendering.assets.texture.TextureData;
2121

2222
import java.awt.Color;

0 commit comments

Comments
 (0)