From 986a5cdc9e31d273d6c77d24a76710575a3b2bb3 Mon Sep 17 00:00:00 2001 From: KrLite <68179735+KrLite@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:32:01 +0800 Subject: [PATCH] 1.15 --- gradle.properties | 4 +- .../ColorAnimator.java | 22 ++++++-- .../net/krlite/equator/annotation/See.java | 9 ---- .../net/krlite/equator/annotation/Sees.java | 5 -- .../krlite/equator/color/PreciseColor.java | 2 - .../krlite/equator/color/PreciseColors.java | 50 +++++++++++-------- .../net/krlite/equator/geometry/Node.java | 2 +- .../krlite/equator/math/CoordinateSolver.java | 1 - .../net/krlite/equator/render/Equator.java | 9 +--- .../render/sprite/HorizontalSprite.java | 2 - .../equator/render/sprite/SurfaceSprite.java | 2 - .../equator/render/sprite/VerticalSprite.java | 2 - .../equator/util/QuaternionAdapter.java | 3 -- .../krlite/equator/util/pair/ColorPair.java | 22 ++++++++ 14 files changed, 76 insertions(+), 59 deletions(-) rename src/main/java/net/krlite/equator/{animator => animation}/ColorAnimator.java (72%) delete mode 100644 src/main/java/net/krlite/equator/annotation/See.java delete mode 100644 src/main/java/net/krlite/equator/annotation/Sees.java create mode 100644 src/main/java/net/krlite/equator/util/pair/ColorPair.java diff --git a/gradle.properties b/gradle.properties index cdd269a..57983a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,10 +6,10 @@ minecraft_version = 1.19.3 yarn_mappings = 1.19.3+build.5 loader_version = 0.14.11 -mod_version = 1.14 +mod_version = 1.15 maven_group = net.krlite archives_base_name = equator-lib-1.19.3 # Dependencies fabric_version = 0.71.0+1.19.3 -equator_utils_version = v1.1.11 +equator_utils_version = v1.1.12 diff --git a/src/main/java/net/krlite/equator/animator/ColorAnimator.java b/src/main/java/net/krlite/equator/animation/ColorAnimator.java similarity index 72% rename from src/main/java/net/krlite/equator/animator/ColorAnimator.java rename to src/main/java/net/krlite/equator/animation/ColorAnimator.java index c12aeb8..0e64a7c 100644 --- a/src/main/java/net/krlite/equator/animator/ColorAnimator.java +++ b/src/main/java/net/krlite/equator/animation/ColorAnimator.java @@ -1,15 +1,31 @@ -package net.krlite.equator.animator; +package net.krlite.equator.animation; import net.krlite.equator.animation.base.ValueAnimator; -import net.krlite.equator.annotation.See; import net.krlite.equator.color.core.BasicRGBA; -@See(ValueAnimator.class) +/** + * @see ValueAnimator + * @see BasicRGBA + */ public class ColorAnimator extends ValueAnimator> { + /** + * Creates a new value animator. + * + * @param start The animator's start value. + * @param end The animator's end value. + * @param delta The animator's animation ratio. + */ public ColorAnimator(BasicRGBA start, BasicRGBA end, double delta) { super(start, end, delta); } + /** + * Creates a new value animator with the default + * animation ratio of 0.075. + * + * @param start The animator's start value. + * @param end The animator's end value. + */ public ColorAnimator(BasicRGBA start, BasicRGBA end) { super(start, end); } diff --git a/src/main/java/net/krlite/equator/annotation/See.java b/src/main/java/net/krlite/equator/annotation/See.java deleted file mode 100644 index 939a130..0000000 --- a/src/main/java/net/krlite/equator/annotation/See.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.krlite.equator.annotation; - - -import java.lang.annotation.Repeatable; - -@Repeatable(Sees.class) -public @interface See { - Class value(); -} diff --git a/src/main/java/net/krlite/equator/annotation/Sees.java b/src/main/java/net/krlite/equator/annotation/Sees.java deleted file mode 100644 index 6ce2525..0000000 --- a/src/main/java/net/krlite/equator/annotation/Sees.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.krlite.equator.annotation; - -public @interface Sees { - See[] value(); -} diff --git a/src/main/java/net/krlite/equator/color/PreciseColor.java b/src/main/java/net/krlite/equator/color/PreciseColor.java index f8ac186..321d66f 100644 --- a/src/main/java/net/krlite/equator/color/PreciseColor.java +++ b/src/main/java/net/krlite/equator/color/PreciseColor.java @@ -1,6 +1,5 @@ package net.krlite.equator.color; -import net.krlite.equator.annotation.See; import net.krlite.equator.base.HashCodeComparable; import net.krlite.equator.color.core.BasicRGBA; import org.jetbrains.annotations.Nullable; @@ -8,7 +7,6 @@ import java.awt.*; -@See(BasicRGBA.class) public class PreciseColor extends HashCodeComparable implements BasicRGBA { public static final PreciseColor WHITE = new PreciseColor(1, 1, 1); public static final PreciseColor BLACK = new PreciseColor(0, 0, 0); diff --git a/src/main/java/net/krlite/equator/color/PreciseColors.java b/src/main/java/net/krlite/equator/color/PreciseColors.java index e4050ac..3a570f4 100644 --- a/src/main/java/net/krlite/equator/color/PreciseColors.java +++ b/src/main/java/net/krlite/equator/color/PreciseColors.java @@ -1,14 +1,9 @@ package net.krlite.equator.color; -import net.krlite.equator.annotation.See; -import net.krlite.equator.annotation.Sees; -import net.krlite.equator.color.core.BasicRGBA; - -@See(BasicRGBA.class) -@See(PreciseColor.class) -@SuppressWarnings("unused") public class PreciseColors { - // === Translucent basic === + /* + * TRANSLUCENT BASIC + */ public static final PreciseColor TRANSLUCENT_WHITE = new PreciseColor(1, 1, 1, 0.5); public static final PreciseColor TRANSLUCENT_BLACK = new PreciseColor(0, 0, 0, 0.5); public static final PreciseColor TRANSLUCENT_RED = new PreciseColor(1, 0, 0, 0.5); @@ -18,14 +13,18 @@ public class PreciseColors { public static final PreciseColor TRANSLUCENT_MAGENTA = new PreciseColor(1, 0, 1, 0.5); public static final PreciseColor TRANSLUCENT_CYAN = new PreciseColor(0, 1, 1, 0.5); - // === Grayscale === + /* + * GRAYSCALE + */ public static final PreciseColor NEAR_WHITE = new PreciseColor(0.95); public static final PreciseColor LIGHT_GRAY = new PreciseColor(0.75); public static final PreciseColor GRAY = new PreciseColor(0.5); public static final PreciseColor DARK_GRAY = new PreciseColor(0.25); public static final PreciseColor NEAR_BLACK = new PreciseColor(0.05); - // === Normal === + /* + * NORMAL + */ public static final PreciseColor GOLD = new PreciseColor(1, 0.85, 0); public static final PreciseColor SILVER = new PreciseColor(0.65, 0.66, 0.67); public static final PreciseColor LIME = new PreciseColor(0.75, 1, 0); @@ -34,7 +33,9 @@ public class PreciseColors { public static final PreciseColor PURPLE = new PreciseColor(0.5, 0, 0.5); public static final PreciseColor PINK = new PreciseColor(1, 0.75, 0.8); - // === Dark basic === + /* + * DARK BASIC + */ public static final PreciseColor DARK_RED = new PreciseColor(0.5, 0, 0); public static final PreciseColor DARK_GREEN = new PreciseColor(0, 0.5, 0); public static final PreciseColor DARK_BLUE = new PreciseColor(0, 0, 0.5); @@ -42,7 +43,9 @@ public class PreciseColors { public static final PreciseColor DARK_MAGENTA = new PreciseColor(0.5, 0, 0.5); public static final PreciseColor DARK_CYAN = new PreciseColor(0, 0.5, 0.5); - // === Light basic === + /* + * LIGHT BASIC + */ public static final PreciseColor LIGHT_RED = new PreciseColor(1, 0.5, 0.5); public static final PreciseColor LIGHT_GREEN = new PreciseColor(0.5, 1, 0.5); public static final PreciseColor LIGHT_BLUE = new PreciseColor(0.5, 0.5, 1); @@ -50,7 +53,9 @@ public class PreciseColors { public static final PreciseColor LIGHT_MAGENTA = new PreciseColor(1, 0.5, 1); public static final PreciseColor LIGHT_CYAN = new PreciseColor(0.5, 1, 1); - // === Dark normal === + /* + * DARK NORMAL + */ public static final PreciseColor DARK_GOLD = new PreciseColor(0.5, 0.425, 0); public static final PreciseColor DARK_SILVER = new PreciseColor(0.325, 0.33, 0.335); public static final PreciseColor DARK_LIME = new PreciseColor(0.375, 0.5, 0); @@ -59,7 +64,9 @@ public class PreciseColors { public static final PreciseColor DARK_BROWN = new PreciseColor(0.4, 0.25, 0.12); public static final PreciseColor DARK_PINK = new PreciseColor(1, 0.41, 0.71); - // === Light normal === + /* + * LIGHT NORMAL + */ public static final PreciseColor LIGHT_GOLD = new PreciseColor(1, 0.7, 0.2); public static final PreciseColor LIGHT_SILVER = new PreciseColor(0.8, 0.8, 0.8); public static final PreciseColor LIGHT_LIME = new PreciseColor(0.8, 1, 0.2); @@ -68,9 +75,12 @@ public class PreciseColors { public static final PreciseColor LIGHT_BROWN = new PreciseColor(0.7, 0.6, 0.5); public static final PreciseColor LIGHT_PINK = new PreciseColor(1, 0.71, 0.76); - // === Minecraft === - // Mojang + /* + * MINECRAFT + */ public static final PreciseColor MOJANG_RED = new PreciseColor(1, 0, 0.5); + public static final PreciseColor MINECRAFT_MISSING_TEXTURE_PURPLE = PreciseColor.of(0xF800F8); + public static final PreciseColor MINECRAFT_MISSING_TEXTURE_BLACK = PreciseColor.of(0x000000); // Foreground public static final PreciseColor MINECOIN_GOLD = PreciseColor.of(0xDDD605); public static final PreciseColor MINECRAFT_BLACK = PreciseColor.of(0x000000); @@ -108,11 +118,10 @@ public class PreciseColors { public static final PreciseColor MINECRAFT_BACKGROUND_LIGHT_PURPLE = PreciseColor.of(0x3F153F); public static final PreciseColor MINECRAFT_BACKGROUND_YELLOW = PreciseColor.of(0x3F3F15); public static final PreciseColor MINECRAFT_BACKGROUND_WHITE = PreciseColor.of(0x3F3F3F); - // Miscellaneous - public static final PreciseColor MINECRAFT_MISSING_TEXTURE_PURPLE = PreciseColor.of(0xF800F8); - public static final PreciseColor MINECRAFT_MISSING_TEXTURE_BLACK = PreciseColor.of(0x000000); - // === Fashionable === + /* + * FASHIONABLE + */ public static final PreciseColor TURQUOISE = new PreciseColor(0.25, 0.88, 0.82); public static final PreciseColor TEAL = new PreciseColor(0, 0.5, 0.5); public static final PreciseColor OLIVE = new PreciseColor(0.5, 0.5, 0); @@ -165,4 +174,5 @@ public class PreciseColors { public static final PreciseColor SLATE_GRAY = new PreciseColor(0.44, 0.5, 0.56); public static final PreciseColor SLATE_GREEN = new PreciseColor(0.31, 0.5, 0.44); public static final PreciseColor TIN = new PreciseColor(0.8, 0.8, 0.8); + public static final PreciseColor TIN_SHINE = new PreciseColor(0.9, 0.9, 0.9); } diff --git a/src/main/java/net/krlite/equator/geometry/Node.java b/src/main/java/net/krlite/equator/geometry/Node.java index c3a3636..ed2e94f 100644 --- a/src/main/java/net/krlite/equator/geometry/Node.java +++ b/src/main/java/net/krlite/equator/geometry/Node.java @@ -6,7 +6,7 @@ import net.krlite.equator.core.Operatable; import net.krlite.equator.core.ShortStringable; import net.krlite.equator.core.SimpleOperations; -import net.krlite.equator.function.AngleFunctions; +import net.krlite.equator.math.AngleFunctions; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/net/krlite/equator/math/CoordinateSolver.java b/src/main/java/net/krlite/equator/math/CoordinateSolver.java index eea3560..35beed8 100644 --- a/src/main/java/net/krlite/equator/math/CoordinateSolver.java +++ b/src/main/java/net/krlite/equator/math/CoordinateSolver.java @@ -1,6 +1,5 @@ package net.krlite.equator.math; -import net.krlite.equator.function.AngleFunctions; import net.minecraft.entity.player.PlayerEntity; import java.util.Objects; diff --git a/src/main/java/net/krlite/equator/render/Equator.java b/src/main/java/net/krlite/equator/render/Equator.java index 2c21535..3d1a3f1 100644 --- a/src/main/java/net/krlite/equator/render/Equator.java +++ b/src/main/java/net/krlite/equator/render/Equator.java @@ -2,7 +2,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import net.krlite.equator.annotation.See; import net.krlite.equator.color.PreciseColor; import net.krlite.equator.color.PreciseColors; import net.krlite.equator.color.core.BasicRGBA; @@ -14,8 +13,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.*; -import net.minecraft.client.render.block.BlockRenderManager; -import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.texture.SpriteAtlasTexture; @@ -525,9 +522,8 @@ private static void applyModelView(MatrixStack matrixStack, Quaterniondc quatern RenderSystem.applyModelViewMatrix(); } - @See(ItemRenderer.class) public record ItemModel(ItemStack itemStack) implements ShortStringable, Cloneable { - public ItemModel render(Vec3d pos, boolean leftHanded, @See(QuaternionAdapter.class) Quaterniondc quaternion) { + public ItemModel render(Vec3d pos, boolean leftHanded, Quaterniondc quaternion) { BakedModel bakedModel = MinecraftClient.getInstance().getItemRenderer().getModel(itemStack, null, null, 0); prepareModel(); MatrixStack matrixStack = RenderSystem.getModelViewStack(); @@ -651,9 +647,8 @@ public ItemModel clone() { } } - @See(BlockRenderManager.class) public record BlockModel(BlockState blockState) implements ShortStringable, Cloneable { - public BlockModel render(Vec3d pos, @See(QuaternionAdapter.class) Quaterniondc quaternion) { + public BlockModel render(Vec3d pos, Quaterniondc quaternion) { prepareModel(); MatrixStack matrixStack = RenderSystem.getModelViewStack(); diff --git a/src/main/java/net/krlite/equator/render/sprite/HorizontalSprite.java b/src/main/java/net/krlite/equator/render/sprite/HorizontalSprite.java index b7275e8..e0d8f28 100644 --- a/src/main/java/net/krlite/equator/render/sprite/HorizontalSprite.java +++ b/src/main/java/net/krlite/equator/render/sprite/HorizontalSprite.java @@ -1,6 +1,5 @@ package net.krlite.equator.render.sprite; -import net.krlite.equator.annotation.See; import net.krlite.equator.core.ShortStringable; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -8,7 +7,6 @@ /** * A sprite that defines a horizontal set of {@link IdentifierSprite}s. */ -@See(IdentifierSprite.class) public record HorizontalSprite(Identifier identifier, int step) implements ShortStringable, Cloneable { /** * Creates a {@link HorizontalSprite} by splitting an {@link Identifier} horizontally into slices. diff --git a/src/main/java/net/krlite/equator/render/sprite/SurfaceSprite.java b/src/main/java/net/krlite/equator/render/sprite/SurfaceSprite.java index 8c7ee51..d6ac016 100644 --- a/src/main/java/net/krlite/equator/render/sprite/SurfaceSprite.java +++ b/src/main/java/net/krlite/equator/render/sprite/SurfaceSprite.java @@ -1,6 +1,5 @@ package net.krlite.equator.render.sprite; -import net.krlite.equator.annotation.See; import net.krlite.equator.core.ShortStringable; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -10,7 +9,6 @@ /** * A sprite that defines a 2D array set of {@link IdentifierSprite}s. */ -@See(IdentifierSprite.class) public record SurfaceSprite(Identifier identifier, int stepX, int stepY) implements ShortStringable, Cloneable { /** * Creates a {@link SurfaceSprite} by splitting an {@link Identifier} into pieces. diff --git a/src/main/java/net/krlite/equator/render/sprite/VerticalSprite.java b/src/main/java/net/krlite/equator/render/sprite/VerticalSprite.java index 2eb936b..74e57d9 100644 --- a/src/main/java/net/krlite/equator/render/sprite/VerticalSprite.java +++ b/src/main/java/net/krlite/equator/render/sprite/VerticalSprite.java @@ -1,6 +1,5 @@ package net.krlite.equator.render.sprite; -import net.krlite.equator.annotation.See; import net.krlite.equator.core.ShortStringable; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -10,7 +9,6 @@ /** * A sprite that defines a vertical set of {@link IdentifierSprite}s. */ -@See(IdentifierSprite.class) public record VerticalSprite(Identifier identifier, int step) implements ShortStringable, Cloneable { /** * Creates a {@link VerticalSprite} by splitting an {@link Identifier} vertically into slices. diff --git a/src/main/java/net/krlite/equator/util/QuaternionAdapter.java b/src/main/java/net/krlite/equator/util/QuaternionAdapter.java index cc8e972..264a8c7 100644 --- a/src/main/java/net/krlite/equator/util/QuaternionAdapter.java +++ b/src/main/java/net/krlite/equator/util/QuaternionAdapter.java @@ -1,13 +1,10 @@ package net.krlite.equator.util; -import net.krlite.equator.annotation.See; import org.joml.Quaterniond; import org.joml.Quaterniondc; import org.joml.Quaternionf; import org.joml.Quaternionfc; -@See(Quaternionfc.class) -@See(Quaterniondc.class) public class QuaternionAdapter { public static Quaterniond fromEulerDeg(double x, double y, double z, double w) { return new Quaterniond(Math.toRadians(x), Math.toRadians(y), Math.toRadians(z), w); diff --git a/src/main/java/net/krlite/equator/util/pair/ColorPair.java b/src/main/java/net/krlite/equator/util/pair/ColorPair.java new file mode 100644 index 0000000..e6d10d8 --- /dev/null +++ b/src/main/java/net/krlite/equator/util/pair/ColorPair.java @@ -0,0 +1,22 @@ +package net.krlite.equator.util.pair; + +import net.krlite.equator.color.PreciseColor; +import net.krlite.equator.color.core.BasicRGBA; + +import java.awt.*; + +public class ColorPair extends Pair { + /** + * Creates a new pair. + * + * @param first The first element. + * @param second The second element. + */ + public ColorPair(BasicRGBA first, BasicRGBA second) { + super(PreciseColor.of(first), PreciseColor.of(second)); + } + + public ColorPair(Color first, Color second) { + super(PreciseColor.of(first), PreciseColor.of(second)); + } +}