chore: upgrade to gestalt-module 7.1 from 7.0 MovingBlocks/Terasology…

…#4622
Terasology-Archived · May 2, 2021 · 30b0868 · 30b0868
2 parents a695572 + 28b1465
commit 30b0868
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/terasology/durability/DurabilityClientSystem.java b/src/main/java/org/terasology/durability/DurabilityClientSystem.java
@@ -16,7 +16,7 @@
 package org.terasology.durability;
 
 import org.joml.Vector2i;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;

diff --git a/src/main/java/org/terasology/herbalism/system/HerbIconAssetResolver.java b/src/main/java/org/terasology/herbalism/system/HerbIconAssetResolver.java
@@ -16,15 +16,15 @@
 package org.terasology.herbalism.system;
 
 import com.google.common.collect.ImmutableSet;
-import org.terasology.assets.AssetDataProducer;
-import org.terasology.assets.ResourceUrn;
-import org.terasology.assets.management.AssetManager;
-import org.terasology.assets.module.annotations.RegisterAssetDataProducer;
+import org.terasology.gestalt.assets.AssetDataProducer;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.gestalt.assets.module.annotations.RegisterAssetDataProducer;
 import org.terasology.engine.rendering.assets.texture.Texture;
 import org.terasology.engine.rendering.assets.texture.TextureData;
 import org.terasology.engine.rendering.assets.texture.TextureRegionAsset;
 import org.terasology.engine.rendering.assets.texture.TextureUtil;
-import org.terasology.naming.Name;
+import org.terasology.gestalt.naming.Name;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;

diff --git a/src/main/java/org/terasology/herbalism/system/HerbalismCommonSystem.java b/src/main/java/org/terasology/herbalism/system/HerbalismCommonSystem.java
@@ -22,7 +22,7 @@
 import org.terasology.alterationEffects.speed.MultiJumpAlterationEffect;
 import org.terasology.alterationEffects.speed.SwimSpeedAlterationEffect;
 import org.terasology.alterationEffects.speed.WalkSpeedAlterationEffect;
-import org.terasology.assets.management.AssetManager;
+import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.entitySystem.prefab.PrefabManager;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;

diff --git a/...main/java/org/terasology/was/integration/journal/FarmingAndCookingJournalIntegration.java b/...main/java/org/terasology/was/integration/journal/FarmingAndCookingJournalIntegration.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.prefab.Prefab;

diff --git a/src/main/java/org/terasology/was/system/RegisterWoodAndStoneRecipes.java b/src/main/java/org/terasology/was/system/RegisterWoodAndStoneRecipes.java
@@ -16,7 +16,7 @@
 package org.terasology.was.system;
 
 import com.google.common.base.Predicate;
-import org.terasology.assets.ResourceUrn;
+import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.crafting.component.CraftInHandRecipeComponent;
 import org.terasology.crafting.component.CraftingStationMaterialComponent;
 import org.terasology.crafting.component.CraftingStationRecipeComponent;

diff --git a/src/main/java/org/terasology/was/system/SeedingFruitRecipe.java b/src/main/java/org/terasology/was/system/SeedingFruitRecipe.java
@@ -32,7 +32,7 @@
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.module.inventory.ui.ItemIcon;
 import org.terasology.engine.utilities.Assets;
-import org.terasology.naming.Name;
+import org.terasology.gestalt.naming.Name;
 
 import java.util.Arrays;
 import java.util.LinkedList;