From bbf111567f2c15307c01827160e913c784b07b86 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sat, 3 Apr 2021 08:54:10 -0700 Subject: [PATCH] chore: migrate gestalt v7 PR: https://github.com/MovingBlocks/Terasology/pull/4593 --- .../terasology/durability/DurabilityClientSystem.java | 2 +- .../herbalism/system/HerbIconAssetResolver.java | 10 +++++----- .../herbalism/system/HerbalismCommonSystem.java | 2 +- .../journal/FarmingAndCookingJournalIntegration.java | 2 +- .../was/system/RegisterWoodAndStoneRecipes.java | 2 +- .../org/terasology/was/system/SeedingFruitRecipe.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/terasology/durability/DurabilityClientSystem.java b/src/main/java/org/terasology/durability/DurabilityClientSystem.java index 626a471..fbaddab 100644 --- 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 index 8fd2d22..ccc111d 100644 --- 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 index 887d198..10b6dc2 100644 --- 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/src/main/java/org/terasology/was/integration/journal/FarmingAndCookingJournalIntegration.java b/src/main/java/org/terasology/was/integration/journal/FarmingAndCookingJournalIntegration.java index 9f421b2..74f10e9 100644 --- a/src/main/java/org/terasology/was/integration/journal/FarmingAndCookingJournalIntegration.java +++ b/src/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 index eac63b8..7fc5dbb 100644 --- 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 index bd027b4..b55e507 100644 --- 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;