From a2930bf89c0b887e20ba186ce1d50dedc55f51d9 Mon Sep 17 00:00:00 2001 From: Dmitry Luk Date: Sun, 23 Jun 2024 12:49:10 +0500 Subject: [PATCH] feat: issue #267 * fix: effects color --- .../api/entity/effect/AbstractEffectType.java | 1 + .../effect/type/EffectAbsorptionType.java | 2 +- .../effect/type/EffectBlindnessType.java | 2 +- .../effect/type/EffectFireResistanceType.java | 2 +- .../entity/effect/type/EffectHungerType.java | 2 +- .../effect/type/EffectInfestedType.java | 19 +++++++++++++++++++ .../effect/type/EffectInstantDamageType.java | 2 +- .../effect/type/EffectInvisibilityType.java | 2 +- .../effect/type/EffectJumpBoostType.java | 2 +- .../effect/type/EffectNightVisionType.java | 2 +- .../entity/effect/type/EffectOozingType.java | 19 +++++++++++++++++++ .../entity/effect/type/EffectPoisonType.java | 2 +- .../effect/type/EffectRaidOmenType.java | 19 +++++++++++++++++++ .../effect/type/EffectResistanceType.java | 2 +- .../effect/type/EffectSaturationType.java | 2 +- .../effect/type/EffectSlowFallingType.java | 2 +- .../effect/type/EffectSlownessType.java | 2 +- .../entity/effect/type/EffectSpeedType.java | 2 +- .../effect/type/EffectStrengthType.java | 2 +- .../effect/type/EffectTrialOmenType.java | 19 +++++++++++++++++++ .../effect/type/EffectWaterBreathingType.java | 2 +- .../entity/effect/type/EffectWeavingType.java | 19 +++++++++++++++++++ .../effect/type/EffectWindChargedType.java | 19 +++++++++++++++++++ .../entity/effect/type/EffectWitherType.java | 2 +- 24 files changed, 132 insertions(+), 17 deletions(-) create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInfestedType.java create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectOozingType.java create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectRaidOmenType.java create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectTrialOmenType.java create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWeavingType.java create mode 100644 Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWindChargedType.java diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/AbstractEffectType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/AbstractEffectType.java index 696328382..05e0a050b 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/AbstractEffectType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/AbstractEffectType.java @@ -9,6 +9,7 @@ * Allay Project 2023/10/27 * * @author daoge_cmd + * @see Effect list */ @Getter public abstract class AbstractEffectType implements EffectType { diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java index 539ae315c..434a6a642 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java @@ -14,6 +14,6 @@ public class EffectAbsorptionType extends AbstractEffectType { public static final EffectAbsorptionType ABSORPTION_TYPE = new EffectAbsorptionType(); private EffectAbsorptionType() { - super(22, new Identifier("minecraft:absorption"), new Color(36, 107, 251)); + super(22, new Identifier("minecraft:absorption"), new Color(37, 82, 165)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectBlindnessType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectBlindnessType.java index f9415c3e7..92244286d 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectBlindnessType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectBlindnessType.java @@ -14,6 +14,6 @@ public class EffectBlindnessType extends AbstractEffectType { public static final EffectBlindnessType BLINDNESS_TYPE = new EffectBlindnessType(); private EffectBlindnessType() { - super(15, new Identifier("minecraft:blindness"), new Color(191, 192, 192), true); + super(15, new Identifier("minecraft:blindness"), new Color(31, 31, 35), true); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectFireResistanceType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectFireResistanceType.java index c6bbf9a2c..d119295d5 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectFireResistanceType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectFireResistanceType.java @@ -14,6 +14,6 @@ public class EffectFireResistanceType extends AbstractEffectType { public static final EffectFireResistanceType FIRE_RESISTANCE_TYPE = new EffectFireResistanceType(); private EffectFireResistanceType() { - super(12, new Identifier("minecraft:fire_resistance"), new Color(228, 154, 58)); + super(12, new Identifier("minecraft:fire_resistance"), new Color(255, 153, 0)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHungerType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHungerType.java index e812c8148..3734db6a3 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHungerType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHungerType.java @@ -14,6 +14,6 @@ public class EffectHungerType extends AbstractEffectType { public static final EffectHungerType HUNGER_TYPE = new EffectHungerType(); private EffectHungerType() { - super(17, new Identifier("minecraft:hunger"), new Color(46, 139, 87), true); + super(17, new Identifier("minecraft:hunger"), new Color(88, 118, 83), true); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInfestedType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInfestedType.java new file mode 100644 index 000000000..a7fc34af8 --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInfestedType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectInfestedType extends AbstractEffectType { + public static final EffectInfestedType INFESTED_TYPE = new EffectInfestedType(); + + private EffectInfestedType() { + super(35, new Identifier("minecraft:infested"), new Color(140, 155, 140), true); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInstantDamageType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInstantDamageType.java index 45c609c09..7c022b0b5 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInstantDamageType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInstantDamageType.java @@ -14,6 +14,6 @@ public class EffectInstantDamageType extends AbstractEffectType { public static final EffectInstantDamageType INSTANT_DAMAGE_TYPE = new EffectInstantDamageType(); private EffectInstantDamageType() { - super(7, new Identifier("minecraft:instant_damage"), new Color(67, 10, 9), true); + super(7, new Identifier("minecraft:instant_damage"), new Color(169, 101, 106), true); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInvisibilityType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInvisibilityType.java index 7377d244f..0ebacca01 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInvisibilityType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectInvisibilityType.java @@ -14,6 +14,6 @@ public class EffectInvisibilityType extends AbstractEffectType { public static final EffectInvisibilityType INVISIBILITY_TYPE = new EffectInvisibilityType(); private EffectInvisibilityType() { - super(14, new Identifier("minecraft:invisibility"), new Color(127, 131, 146)); + super(14, new Identifier("minecraft:invisibility"), new Color(246, 246, 246)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectJumpBoostType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectJumpBoostType.java index 53a8ba1b0..e83b95075 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectJumpBoostType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectJumpBoostType.java @@ -14,6 +14,6 @@ public class EffectJumpBoostType extends AbstractEffectType { public static final EffectJumpBoostType JUMP_BOOST_TYPE = new EffectJumpBoostType(); private EffectJumpBoostType() { - super(8, new Identifier("minecraft:jump_boost"), new Color(34, 255, 76)); + super(8, new Identifier("minecraft:jump_boost"), new Color(253, 255, 132)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectNightVisionType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectNightVisionType.java index e69a69ec5..047c6c2c8 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectNightVisionType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectNightVisionType.java @@ -14,6 +14,6 @@ public class EffectNightVisionType extends AbstractEffectType { public static final EffectNightVisionType NIGHT_VISION_TYPE = new EffectNightVisionType(); private EffectNightVisionType() { - super(16, new Identifier("minecraft:night_vision"), new Color(0, 0, 139)); + super(16, new Identifier("minecraft:night_vision"), new Color(194, 255, 102)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectOozingType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectOozingType.java new file mode 100644 index 000000000..0c33879fd --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectOozingType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectOozingType extends AbstractEffectType { + public static final EffectOozingType OOZING_TYPE = new EffectOozingType(); + + private EffectOozingType() { + super(34, new Identifier("minecraft:oozing"), new Color(153, 255, 163), true); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectPoisonType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectPoisonType.java index 88600b6b7..8dc0c350e 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectPoisonType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectPoisonType.java @@ -14,6 +14,6 @@ public class EffectPoisonType extends AbstractEffectType { public static final EffectPoisonType POISON_TYPE = new EffectPoisonType(); private EffectPoisonType() { - super(19, new Identifier("minecraft:poison"), new Color(78, 147, 49), true); + super(19, new Identifier("minecraft:poison"), new Color(135, 163, 99), true); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectRaidOmenType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectRaidOmenType.java new file mode 100644 index 000000000..cb56a977b --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectRaidOmenType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectRaidOmenType extends AbstractEffectType { + public static final EffectRaidOmenType RAID_OMEN_TYPE = new EffectRaidOmenType(); + + private EffectRaidOmenType() { + super(36, new Identifier("minecraft:raid_omen"), new Color(222, 64, 88)); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectResistanceType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectResistanceType.java index 3258ca3e0..b565c734b 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectResistanceType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectResistanceType.java @@ -14,6 +14,6 @@ public class EffectResistanceType extends AbstractEffectType { public static final EffectResistanceType RESISTANCE_TYPE = new EffectResistanceType(); private EffectResistanceType() { - super(11, new Identifier("minecraft:resistance"), new Color(153, 69, 58)); + super(11, new Identifier("minecraft:resistance"), new Color(145, 70, 240)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSaturationType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSaturationType.java index 2c18488fd..3ca8d7cf7 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSaturationType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSaturationType.java @@ -14,6 +14,6 @@ public class EffectSaturationType extends AbstractEffectType { public static final EffectSaturationType SATURATION_TYPE = new EffectSaturationType(); private EffectSaturationType() { - super(23, new Identifier("minecraft:saturation"), new Color(255, 0, 255)); + super(23, new Identifier("minecraft:saturation"), new Color(248, 36, 35)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlowFallingType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlowFallingType.java index c56af7b50..fc8ad706f 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlowFallingType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlowFallingType.java @@ -14,6 +14,6 @@ public class EffectSlowFallingType extends AbstractEffectType { public static final EffectSlowFallingType SLOW_FALLING_TYPE = new EffectSlowFallingType(); private EffectSlowFallingType() { - super(27, new Identifier("minecraft:slow_falling"), new Color(206, 255, 255)); + super(27, new Identifier("minecraft:slow_falling"), new Color(243, 207, 185)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java index 0d83f6984..a1e1d1151 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java @@ -14,6 +14,6 @@ public class EffectSlownessType extends AbstractEffectType { public static final EffectSlownessType SLOWNESS_TYPE = new EffectSlownessType(); private EffectSlownessType() { - super(2, new Identifier("minecraft:slowness"), new Color(90, 108, 129), true); + super(2, new Identifier("minecraft:slowness"), new Color(139, 175, 224), true); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java index 05cf5e5b7..a573f5e43 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java @@ -14,6 +14,6 @@ public class EffectSpeedType extends AbstractEffectType { public static final EffectSpeedType SPEED_TYPE = new EffectSpeedType(); private EffectSpeedType() { - super(1, new Identifier("minecraft:speed"), new Color(124, 175, 198)); + super(1, new Identifier("minecraft:speed"), new Color(51, 235, 255)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectStrengthType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectStrengthType.java index cf802b605..519dda562 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectStrengthType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectStrengthType.java @@ -14,6 +14,6 @@ public class EffectStrengthType extends AbstractEffectType { public static final EffectStrengthType STRENGTH_TYPE = new EffectStrengthType(); private EffectStrengthType() { - super(5, new Identifier("minecraft:strength"), new Color(147, 36, 35)); + super(5, new Identifier("minecraft:strength"), new Color(255, 199, 0)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectTrialOmenType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectTrialOmenType.java new file mode 100644 index 000000000..a87ceb97b --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectTrialOmenType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectTrialOmenType extends AbstractEffectType { + public static final EffectTrialOmenType TRIAL_OMEN_TYPE = new EffectTrialOmenType(); + + private EffectTrialOmenType() { + super(31, new Identifier("minecraft:trial_omen"), new Color(22, 166, 166)); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWaterBreathingType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWaterBreathingType.java index a0e107e9d..52449a8f9 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWaterBreathingType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWaterBreathingType.java @@ -14,6 +14,6 @@ public class EffectWaterBreathingType extends AbstractEffectType { public static final EffectWaterBreathingType WATER_BREATHING_TYPE = new EffectWaterBreathingType(); private EffectWaterBreathingType() { - super(13, new Identifier("minecraft:water_breathing"), new Color(46, 82, 153)); + super(13, new Identifier("minecraft:water_breathing"), new Color(152, 218, 192)); } } diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWeavingType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWeavingType.java new file mode 100644 index 000000000..3fa669941 --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWeavingType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectWeavingType extends AbstractEffectType { + public static final EffectWeavingType WEAVING_OMEN_TYPE = new EffectWeavingType(); + + private EffectWeavingType() { + super(33, new Identifier("minecraft:weaving"), new Color(120, 105, 90), true); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWindChargedType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWindChargedType.java new file mode 100644 index 000000000..fbf91a48b --- /dev/null +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWindChargedType.java @@ -0,0 +1,19 @@ +package org.allaymc.api.entity.effect.type; + +import org.allaymc.api.entity.effect.AbstractEffectType; +import org.allaymc.api.utils.Identifier; + +import java.awt.*; + +/** + * Allay Project 23/06/2024 + * + * @author IWareQ + */ +public class EffectWindChargedType extends AbstractEffectType { + public static final EffectWindChargedType WIND_CHARGED_TYPE = new EffectWindChargedType(); + + private EffectWindChargedType() { + super(32, new Identifier("minecraft:wind_charged"), new Color(189, 201, 255), true); + } +} diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWitherType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWitherType.java index 644ee88c0..2a5a24b91 100644 --- a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWitherType.java +++ b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectWitherType.java @@ -14,6 +14,6 @@ public class EffectWitherType extends AbstractEffectType { public static final EffectWitherType WITHER_TYPE = new EffectWitherType(); private EffectWitherType() { - super(20, new Identifier("minecraft:wither"), new Color(53, 42, 39), true); + super(20, new Identifier("minecraft:wither"), new Color(115, 97, 86), true); } }