From f7dd39e89a812ffcd0a41ae1af88c3af2531b220 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Nov 2019 23:20:24 +0200 Subject: [PATCH] Moved Color to the common package --- .../java/com/minelittlepony/client/model/gear/ChristmasHat.java | 2 +- .../java/com/minelittlepony/client/model/part/UnicornHorn.java | 2 +- .../minelittlepony/client/render/LevitatingItemRenderer.java | 2 +- .../client/render/entity/feature/LayerPonyArmor.java | 2 +- src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java | 2 +- .../minelittlepony/{client/util/render => util/math}/Color.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/minelittlepony/{client/util/render => util/math}/Color.java (96%) diff --git a/src/main/java/com/minelittlepony/client/model/gear/ChristmasHat.java b/src/main/java/com/minelittlepony/client/model/gear/ChristmasHat.java index b681bd30..01a34f84 100644 --- a/src/main/java/com/minelittlepony/client/model/gear/ChristmasHat.java +++ b/src/main/java/com/minelittlepony/client/model/gear/ChristmasHat.java @@ -7,10 +7,10 @@ import net.minecraft.entity.Entity; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.client.util.render.Color; import com.minelittlepony.model.BodyPart; import com.minelittlepony.model.IModel; import com.minelittlepony.pony.meta.Wearable; +import com.minelittlepony.util.math.Color; import java.util.Calendar; import java.util.UUID; diff --git a/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java b/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java index 240aaae8..4005857f 100644 --- a/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java +++ b/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java @@ -9,10 +9,10 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.MatrixStack; -import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.Part; import com.minelittlepony.model.ICapitated; import com.minelittlepony.model.IPart; +import com.minelittlepony.util.math.Color; import javax.annotation.Nullable; diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index c2698506..6ca1b935 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -3,8 +3,8 @@ package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.client.util.render.Color; import com.minelittlepony.pony.IPony; +import com.minelittlepony.util.math.Color; import com.mojang.blaze3d.platform.GlStateManager.DestFactor; import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java index 1763dece..d79fcb99 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java @@ -5,11 +5,11 @@ import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.armour.DefaultArmourTextureResolver; import com.minelittlepony.client.render.IPonyRender; -import com.minelittlepony.client.util.render.Color; import com.minelittlepony.model.armour.ArmourLayer; import com.minelittlepony.model.armour.IArmour; import com.minelittlepony.model.armour.IArmourTextureResolver; import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.util.math.Color; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java b/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java index e7855074..2d1c092a 100644 --- a/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java +++ b/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java @@ -2,8 +2,8 @@ package com.minelittlepony.pony.meta; import net.minecraft.client.texture.NativeImage; -import com.minelittlepony.client.util.render.Color; import com.minelittlepony.pony.ITriggerPixelMapped; +import com.minelittlepony.util.math.Color; /** * Individual trigger pixels for a pony skin. diff --git a/src/main/java/com/minelittlepony/client/util/render/Color.java b/src/main/java/com/minelittlepony/util/math/Color.java similarity index 96% rename from src/main/java/com/minelittlepony/client/util/render/Color.java rename to src/main/java/com/minelittlepony/util/math/Color.java index 72febcf2..12a63444 100644 --- a/src/main/java/com/minelittlepony/client/util/render/Color.java +++ b/src/main/java/com/minelittlepony/util/math/Color.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.util.render; +package com.minelittlepony.util.math; /** * Colouration Utilities