Skip to content

Commit 4c961f4

Browse files
committed
chore: upgrade to gestalt-module 7.1 from 7.0 MovingBlocks/Terasology#4622
2 parents f113c3c + 0eb301a commit 4c961f4

9 files changed

Lines changed: 26 additions & 26 deletions

File tree

src/main/java/org/terasology/kcomputers/assets/HexFont.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.terasology.kcomputers.assets;
1717

18-
import org.terasology.assets.Asset;
19-
import org.terasology.assets.AssetFactory;
20-
import org.terasology.assets.AssetType;
21-
import org.terasology.assets.ResourceUrn;
22-
import org.terasology.assets.module.annotations.RegisterAssetType;
18+
import org.terasology.gestalt.assets.Asset;
19+
import org.terasology.gestalt.assets.AssetFactory;
20+
import org.terasology.gestalt.assets.AssetType;
21+
import org.terasology.gestalt.assets.ResourceUrn;
22+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetType;
2323
import org.terasology.kallisti.oc.OCFont;
2424

2525
/**

src/main/java/org/terasology/kcomputers/assets/HexFontData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.terasology.kcomputers.assets;
1717

18-
import org.terasology.assets.AssetData;
18+
import org.terasology.gestalt.assets.AssetData;
1919
import org.terasology.kallisti.oc.OCFont;
2020

2121
public class HexFontData implements AssetData {

src/main/java/org/terasology/kcomputers/assets/HexFontFormat.java

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

1818
import com.google.common.base.Charsets;
19-
import org.terasology.assets.ResourceUrn;
20-
import org.terasology.assets.format.AbstractAssetFileFormat;
21-
import org.terasology.assets.format.AssetDataFile;
22-
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
19+
import org.terasology.gestalt.assets.ResourceUrn;
20+
import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
21+
import org.terasology.gestalt.assets.format.AssetDataFile;
22+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetFileFormat;
2323
import org.terasology.kallisti.oc.OCFont;
2424
import org.terasology.kcomputers.KComputersUtil;
2525

src/main/java/org/terasology/kcomputers/assets/KallistiArchive.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.terasology.kcomputers.assets;
1717

18-
import org.terasology.assets.Asset;
19-
import org.terasology.assets.AssetFactory;
20-
import org.terasology.assets.AssetType;
21-
import org.terasology.assets.ResourceUrn;
22-
import org.terasology.assets.module.annotations.RegisterAssetType;
18+
import org.terasology.gestalt.assets.Asset;
19+
import org.terasology.gestalt.assets.AssetFactory;
20+
import org.terasology.gestalt.assets.AssetType;
21+
import org.terasology.gestalt.assets.ResourceUrn;
22+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetType;
2323

2424
/**
2525
* Asset type used for making read-only ZIP files available as filesystem

src/main/java/org/terasology/kcomputers/assets/KallistiArchiveData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.terasology.kcomputers.assets;
1717

18-
import org.terasology.assets.AssetData;
18+
import org.terasology.gestalt.assets.AssetData;
1919
import org.terasology.kallisti.base.interfaces.FileSystem;
2020
import org.terasology.kcomputers.KComputersUtil;
2121

src/main/java/org/terasology/kcomputers/assets/KallistiArchiveFormat.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package org.terasology.kcomputers.assets;
1717

18-
import org.terasology.assets.ResourceUrn;
19-
import org.terasology.assets.format.AbstractAssetFileFormat;
20-
import org.terasology.assets.format.AssetDataFile;
21-
import org.terasology.assets.module.annotations.RegisterAssetFileFormat;
18+
import org.terasology.gestalt.assets.ResourceUrn;
19+
import org.terasology.gestalt.assets.format.AbstractAssetFileFormat;
20+
import org.terasology.gestalt.assets.format.AssetDataFile;
21+
import org.terasology.gestalt.assets.module.annotations.RegisterAssetFileFormat;
2222

2323
import java.io.IOException;
2424
import java.io.InputStream;

src/main/java/org/terasology/kcomputers/components/KallistiDisplayComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.google.common.primitives.UnsignedBytes;
66
import org.joml.Vector3f;
77
import org.joml.Vector3i;
8-
import org.terasology.assets.ResourceUrn;
9-
import org.terasology.assets.management.AssetManager;
8+
import org.terasology.gestalt.assets.ResourceUrn;
9+
import org.terasology.gestalt.assets.management.AssetManager;
1010
import org.terasology.engine.entitySystem.Component;
1111
import org.terasology.engine.entitySystem.entity.EntityManager;
1212
import org.terasology.engine.entitySystem.entity.EntityRef;

src/main/java/org/terasology/kcomputers/components/parts/KallistiMachineOpenComputersComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package org.terasology.kcomputers.components.parts;
1717

1818
import com.google.common.base.Charsets;
19-
import org.terasology.assets.ResourceUrn;
20-
import org.terasology.assets.management.AssetManager;
19+
import org.terasology.gestalt.assets.ResourceUrn;
20+
import org.terasology.gestalt.assets.management.AssetManager;
2121
import org.terasology.engine.entitySystem.Component;
2222
import org.terasology.engine.entitySystem.entity.EntityRef;
2323
import org.terasology.engine.registry.CoreRegistry;

src/main/java/org/terasology/kcomputers/systems/KallistiPeripheralSystem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.terasology.kcomputers.systems;
1717

18-
import org.terasology.assets.ResourceUrn;
19-
import org.terasology.assets.management.AssetManager;
18+
import org.terasology.gestalt.assets.ResourceUrn;
19+
import org.terasology.gestalt.assets.management.AssetManager;
2020
import org.terasology.engine.entitySystem.entity.EntityRef;
2121
import org.terasology.engine.entitySystem.event.ReceiveEvent;
2222
import org.terasology.engine.entitySystem.systems.BaseComponentSystem;

0 commit comments

Comments
 (0)