From b4fbd15ab85ebe652bdfc166b85cbf4a1dac2fd2 Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Fri, 15 Jan 2021 22:50:08 +0100 Subject: [PATCH] feat(JOML): migrate ContainerItemComponent and AssetResolver --- .../terasology/fluid/component/FluidContainerItemComponent.java | 2 +- .../terasology/fluid/system/FluidContainerAssetResolver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/terasology/fluid/component/FluidContainerItemComponent.java b/src/main/java/org/terasology/fluid/component/FluidContainerItemComponent.java index 7b71218..302195b 100644 --- a/src/main/java/org/terasology/fluid/component/FluidContainerItemComponent.java +++ b/src/main/java/org/terasology/fluid/component/FluidContainerItemComponent.java @@ -15,9 +15,9 @@ */ package org.terasology.fluid.component; +import org.joml.Vector2f; import org.terasology.entitySystem.Component; import org.terasology.logic.inventory.ItemDifferentiating; -import org.terasology.math.geom.Vector2f; import org.terasology.network.Replicate; import org.terasology.rendering.assets.texture.TextureRegionAsset; diff --git a/src/main/java/org/terasology/fluid/system/FluidContainerAssetResolver.java b/src/main/java/org/terasology/fluid/system/FluidContainerAssetResolver.java index e239672..3aa0709 100644 --- a/src/main/java/org/terasology/fluid/system/FluidContainerAssetResolver.java +++ b/src/main/java/org/terasology/fluid/system/FluidContainerAssetResolver.java @@ -16,13 +16,13 @@ package org.terasology.fluid.system; import com.google.common.collect.ImmutableSet; +import org.joml.Vector2i; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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.math.geom.Vector2i; import org.terasology.naming.Name; import org.terasology.registry.CoreRegistry; import org.terasology.rendering.assets.texture.Texture;