aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-07-20 00:32:42 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-07-31 21:24:03 -0400
commit8ae13f1b79030dc6ad58f96d6f813fc9d1e924a9 (patch)
tree26b3e120f4e8ba3a929ae317a4dcbc85974b75f4 /src
parent482329f4ec76fdd68135a9b21d7ed9cd60736346 (diff)
downloadSkyblocker-8ae13f1b79030dc6ad58f96d6f813fc9d1e924a9.tar.gz
Skyblocker-8ae13f1b79030dc6ad58f96d6f813fc9d1e924a9.tar.bz2
Skyblocker-8ae13f1b79030dc6ad58f96d6f813fc9d1e924a9.zip
Kuudra Glow
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java8
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java261
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java6
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
8 files changed, 168 insertions, 133 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
index 1e35db1e..441d927b 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
@@ -80,6 +80,14 @@ public class CrimsonIsleCategory {
newValue -> config.crimsonIsle.kuudra.arrowPoisonThreshold = newValue)
.controller(IntegerFieldControllerBuilder::create)
.build())
+ .option(Option.<Boolean>createBuilder()
+ .name(Text.translatable("skyblocker.config.crimsonIsle.kuudra.kuudraGlow"))
+ .description(OptionDescription.of(Text.translatable("skyblocker.config.crimsonIsle.kuudra.kuudraGlow.@Tooltip")))
+ .binding(defaults.crimsonIsle.kuudra.kuudraGlow,
+ () -> config.crimsonIsle.kuudra.kuudraGlow,
+ newValue -> config.crimsonIsle.kuudra.kuudraGlow = newValue)
+ .controller(ConfigUtils::createBooleanController)
+ .build())
.build())
//dojo
.group(OptionGroup.createBuilder()
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
index 6645b88d..00e0f654 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
@@ -38,6 +38,9 @@ public class CrimsonIsleConfig {
@SerialEntry
public int arrowPoisonThreshold = 32;
+
+ @SerialEntry
+ public boolean kuudraGlow = true;
}
public static class Dojo {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
index 7c3c634a..c0d371de 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/ArrowPoisonWarning.java
@@ -2,7 +2,6 @@ package de.hysky.skyblocker.skyblock.crimson.kuudra;
import java.util.function.Supplier;
-import de.hysky.skyblocker.config.SkyblockerConfig;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.config.configs.CrimsonIsleConfig;
import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra.KuudraPhase;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java
index 5bc98894..133e18c7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java
@@ -1,11 +1,8 @@
package de.hysky.skyblocker.skyblock.crimson.kuudra;
import de.hysky.skyblocker.utils.Utils;
-import de.hysky.skyblocker.utils.scheduler.Scheduler;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
@@ -13,11 +10,10 @@ public class Kuudra {
static KuudraPhase phase = KuudraPhase.OTHER;
public static void init() {
- WorldRenderEvents.AFTER_TRANSLUCENT.register(KuudraWaypoints::render);
- ClientLifecycleEvents.CLIENT_STARTED.register(KuudraWaypoints::load);
+ KuudraWaypoints.init();
+
ClientPlayConnectionEvents.JOIN.register((_handler, _sender, _client) -> reset());
ClientReceiveMessageEvents.GAME.register(Kuudra::onMessage);
- Scheduler.INSTANCE.scheduleCyclic(KuudraWaypoints::tick, 20);
}
private static void onMessage(Text text, boolean overlay) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java
new file mode 100644
index 00000000..0b9b88d8
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraGlow.java
@@ -0,0 +1,12 @@
+package de.hysky.skyblocker.skyblock.crimson.kuudra;
+
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import net.minecraft.entity.mob.MagmaCubeEntity;
+
+public class KuudraGlow {
+ private static final int KUUDRA_SIZE = 30;
+
+ public static boolean shouldGlow(MagmaCubeEntity magmaCube, String name) {
+ return SkyblockerConfigManager.get().crimsonIsle.kuudra.kuudraGlow && magmaCube.getSize() == KUUDRA_SIZE && !name.equals("jeb_");
+ }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
index dbf7409a..ba2e6695 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java
@@ -20,10 +20,13 @@ import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.utils.PosUtils;
import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.scheduler.Scheduler;
import de.hysky.skyblocker.utils.waypoint.Waypoint;
import de.hysky.skyblocker.utils.waypoint.Waypoint.Type;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.decoration.ArmorStandEntity;
import net.minecraft.entity.mob.GiantEntity;
@@ -33,130 +36,136 @@ import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper;
public class KuudraWaypoints {
- private static final Logger LOGGER = LogUtils.getLogger();
- private static final float[] SUPPLIES_COLOR = {255f / 255f, 0f, 0f};
- private static final float[] PEARL_COLOR = {57f / 255f, 117f / 255f, 125f / 255f};
- private static final float[] SAFE_SPOT_COLOR = {255f / 255f, 85f / 255f, 255f / 255f};
- private static final Supplier<Type> SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra.suppliesAndFuelWaypointType;
- private static final ObjectArrayList<Waypoint> SAFE_SPOT_WAYPOINTS = new ObjectArrayList<>();
- private static final ObjectArrayList<Waypoint> PEARL_WAYPOINTS = new ObjectArrayList<>();
- private static final Function<float[], Codec<List<Waypoint>>> CODEC = cc -> PosUtils.ALT_BLOCK_POS_CODEC.xmap(
- pos -> new Waypoint(pos, () -> Waypoint.Type.HIGHLIGHT, cc, false),
- waypoint -> waypoint.pos)
- .listOf();
-
- //Use non final lists and swap them out to avoid ConcurrentModificationExceptions
- private static ObjectArrayList<Waypoint> supplyWaypoints = ObjectArrayList.of();
- private static ObjectArrayList<Waypoint> ballistaBuildWaypoints = ObjectArrayList.of();
- private static ObjectArrayList<Waypoint> fuelWaypoints = ObjectArrayList.of();
- private static boolean loaded;
-
- static void load(MinecraftClient client) {
- CompletableFuture<Void> safeSpots = loadWaypoints(client, Identifier.of(SkyblockerMod.NAMESPACE, "crimson/kuudra/safe_spot_waypoints.json"), SAFE_SPOT_WAYPOINTS, SAFE_SPOT_COLOR);
- CompletableFuture<Void> pearls = loadWaypoints(client, Identifier.of(SkyblockerMod.NAMESPACE, "crimson/kuudra/pearl_waypoints.json"), PEARL_WAYPOINTS, PEARL_COLOR);
-
- CompletableFuture.allOf(safeSpots, pearls).whenComplete((_result, _throwable) -> loaded = true);
- }
-
- private static CompletableFuture<Void> loadWaypoints(MinecraftClient client, Identifier file, ObjectArrayList<Waypoint> list, float[] colorComponents) {
- return CompletableFuture.supplyAsync(() -> {
- try (BufferedReader reader = client.getResourceManager().openAsReader(file)) {
- return CODEC.apply(colorComponents).parse(JsonOps.INSTANCE, getWaypoints(reader)).getOrThrow();
- } catch (Exception e) {
- LOGGER.error("[Skyblocker Kuudra Waypoints] Failed to load kuudra waypoints from: {}", file, e);
-
- return List.<Waypoint>of();
- }
- }).thenAccept(list::addAll);
- }
-
- private static JsonElement getWaypoints(BufferedReader reader) {
- return JsonParser.parseReader(reader).getAsJsonObject().getAsJsonArray("waypoints");
- }
-
- static void tick() {
- MinecraftClient client = MinecraftClient.getInstance();
- CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
-
- if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints) && client.player != null) {
- Box searchBox = client.player.getBoundingBox().expand(500d);
- ObjectArrayList<Waypoint> supplies = new ObjectArrayList<>();
- ObjectArrayList<Waypoint> fuelCells = new ObjectArrayList<>();
-
- if ((config.supplyWaypoints || config.fuelWaypoints) && client.world != null) {
- List<GiantEntity> giants = client.world.getEntitiesByClass(GiantEntity.class, searchBox, giant -> giant.getY() < 67);
-
- for (GiantEntity giant : giants) {
- double yawOffset = giant.getYaw() + 115;
-
- double x = giant.getX() + 4.5 * Math.cos((yawOffset) * MathHelper.RADIANS_PER_DEGREE);
- double y = 75;
- double z = giant.getZ() + 4.5 * Math.sin((yawOffset) * MathHelper.RADIANS_PER_DEGREE);
-
- Waypoint waypoint = new Waypoint(BlockPos.ofFloored(x, y, z), SUPPLIES_AND_FUEL_TYPE, SUPPLIES_COLOR, false);
-
- if (Objects.requireNonNull(Kuudra.phase) == Kuudra.KuudraPhase.DPS) {
- fuelCells.add(waypoint);
- } else {
- supplies.add(waypoint);
- }
- }
- }
-
- ObjectArrayList<Waypoint> ballistaBuildSpots = new ObjectArrayList<>();
-
- if (config.ballistaBuildWaypoints && client.world != null) {
- List<ArmorStandEntity> armorStands = client.world.getEntitiesByClass(ArmorStandEntity.class, searchBox, ArmorStandEntity::hasCustomName);
-
- for (ArmorStandEntity armorStand : armorStands) {
- String name = armorStand.getName().getString();
-
- if (config.ballistaBuildWaypoints && name.contains("SNEAK + PUNCH")) {
- ballistaBuildSpots.add(new Waypoint(armorStand.getBlockPos(), () -> Waypoint.Type.WAYPOINT, SUPPLIES_COLOR, false));
- }
- }
- }
-
- supplyWaypoints = supplies;
- ballistaBuildWaypoints = ballistaBuildSpots;
- fuelWaypoints = fuelCells;
- }
- }
-
- static void render(WorldRenderContext context) {
- CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
-
- if (Utils.isInKuudra() && loaded) {
- if (config.supplyWaypoints) {
- for (Waypoint waypoint : supplyWaypoints) {
- waypoint.render(context);
- }
- }
-
- if (config.ballistaBuildWaypoints) {
- for (Waypoint waypoint : ballistaBuildWaypoints) {
- waypoint.render(context);
- }
- }
-
- if (config.fuelWaypoints) {
- for (Waypoint waypoint : fuelWaypoints) {
- waypoint.render(context);
- }
- }
-
- if (config.safeSpotWaypoints) {
- for (Waypoint waypoint : SAFE_SPOT_WAYPOINTS) {
- waypoint.render(context);
- }
- }
-
- //TODO maybe have "dynamic" waypoints that draw a line to the actual spot
- if (config.pearlWaypoints) {
- for (Waypoint waypoint : PEARL_WAYPOINTS) {
- waypoint.render(context);
- }
- }
- }
- }
+ private static final Logger LOGGER = LogUtils.getLogger();
+ private static final float[] SUPPLIES_COLOR = {255f / 255f, 0f, 0f};
+ private static final float[] PEARL_COLOR = {57f / 255f, 117f / 255f, 125f / 255f};
+ private static final float[] SAFE_SPOT_COLOR = {255f / 255f, 85f / 255f, 255f / 255f};
+ private static final Supplier<Type> SUPPLIES_AND_FUEL_TYPE = () -> SkyblockerConfigManager.get().crimsonIsle.kuudra.suppliesAndFuelWaypointType;
+ private static final ObjectArrayList<Waypoint> SAFE_SPOT_WAYPOINTS = new ObjectArrayList<>();
+ private static final ObjectArrayList<Waypoint> PEARL_WAYPOINTS = new ObjectArrayList<>();
+ private static final Function<float[], Codec<List<Waypoint>>> CODEC = cc -> PosUtils.ALT_BLOCK_POS_CODEC.xmap(
+ pos -> new Waypoint(pos, () -> Waypoint.Type.HIGHLIGHT, cc, false),
+ waypoint -> waypoint.pos)
+ .listOf();
+
+ //Use non final lists and swap them out to avoid ConcurrentModificationExceptions
+ private static ObjectArrayList<Waypoint> supplyWaypoints = ObjectArrayList.of();
+ private static ObjectArrayList<Waypoint> ballistaBuildWaypoints = ObjectArrayList.of();
+ private static ObjectArrayList<Waypoint> fuelWaypoints = ObjectArrayList.of();
+ private static boolean loaded;
+
+ static void init() {
+ WorldRenderEvents.AFTER_TRANSLUCENT.register(KuudraWaypoints::render);
+ ClientLifecycleEvents.CLIENT_STARTED.register(KuudraWaypoints::load);
+ Scheduler.INSTANCE.scheduleCyclic(KuudraWaypoints::tick, 20);
+ }
+
+ private static void load(MinecraftClient client) {
+ CompletableFuture<Void> safeSpots = loadWaypoints(client, Identifier.of(SkyblockerMod.NAMESPACE, "crimson/kuudra/safe_spot_waypoints.json"), SAFE_SPOT_WAYPOINTS, SAFE_SPOT_COLOR);
+ CompletableFuture<Void> pearls = loadWaypoints(client, Identifier.of(SkyblockerMod.NAMESPACE, "crimson/kuudra/pearl_waypoints.json"), PEARL_WAYPOINTS, PEARL_COLOR);
+
+ CompletableFuture.allOf(safeSpots, pearls).whenComplete((_result, _throwable) -> loaded = true);
+ }
+
+ private static CompletableFuture<Void> loadWaypoints(MinecraftClient client, Identifier file, ObjectArrayList<Waypoint> list, float[] colorComponents) {
+ return CompletableFuture.supplyAsync(() -> {
+ try (BufferedReader reader = client.getResourceManager().openAsReader(file)) {
+ return CODEC.apply(colorComponents).parse(JsonOps.INSTANCE, getWaypoints(reader)).getOrThrow();
+ } catch (Exception e) {
+ LOGGER.error("[Skyblocker Kuudra Waypoints] Failed to load kuudra waypoints from: {}", file, e);
+
+ return List.<Waypoint>of();
+ }
+ }).thenAccept(list::addAll);
+ }
+
+ private static JsonElement getWaypoints(BufferedReader reader) {
+ return JsonParser.parseReader(reader).getAsJsonObject().getAsJsonArray("waypoints");
+ }
+
+ private static void tick() {
+ MinecraftClient client = MinecraftClient.getInstance();
+ CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
+
+ if (Utils.isInKuudra() && (config.supplyWaypoints || config.fuelWaypoints || config.ballistaBuildWaypoints) && client.player != null) {
+ Box searchBox = client.player.getBoundingBox().expand(500d);
+ ObjectArrayList<Waypoint> supplies = new ObjectArrayList<>();
+ ObjectArrayList<Waypoint> fuelCells = new ObjectArrayList<>();
+
+ if ((config.supplyWaypoints || config.fuelWaypoints) && client.world != null) {
+ List<GiantEntity> giants = client.world.getEntitiesByClass(GiantEntity.class, searchBox, giant -> giant.getY() < 67);
+
+ for (GiantEntity giant : giants) {
+ double yawOffset = giant.getYaw() + 115;
+
+ double x = giant.getX() + 4.5 * Math.cos((yawOffset) * MathHelper.RADIANS_PER_DEGREE);
+ double y = 75;
+ double z = giant.getZ() + 4.5 * Math.sin((yawOffset) * MathHelper.RADIANS_PER_DEGREE);
+
+ Waypoint waypoint = new Waypoint(BlockPos.ofFloored(x, y, z), SUPPLIES_AND_FUEL_TYPE, SUPPLIES_COLOR, false);
+
+ if (Objects.requireNonNull(Kuudra.phase) == Kuudra.KuudraPhase.DPS) {
+ fuelCells.add(waypoint);
+ } else {
+ supplies.add(waypoint);
+ }
+ }
+ }
+
+ ObjectArrayList<Waypoint> ballistaBuildSpots = new ObjectArrayList<>();
+
+ if (config.ballistaBuildWaypoints && client.world != null) {
+ List<ArmorStandEntity> armorStands = client.world.getEntitiesByClass(ArmorStandEntity.class, searchBox, ArmorStandEntity::hasCustomName);
+
+ for (ArmorStandEntity armorStand : armorStands) {
+ String name = armorStand.getName().getString();
+
+ if (config.ballistaBuildWaypoints && name.contains("SNEAK + PUNCH")) {
+ ballistaBuildSpots.add(new Waypoint(armorStand.getBlockPos(), () -> Waypoint.Type.WAYPOINT, SUPPLIES_COLOR, false));
+ }
+ }
+ }
+
+ supplyWaypoints = supplies;
+ ballistaBuildWaypoints = ballistaBuildSpots;
+ fuelWaypoints = fuelCells;
+ }
+ }
+
+ private static void render(WorldRenderContext context) {
+ CrimsonIsleConfig.Kuudra config = SkyblockerConfigManager.get().crimsonIsle.kuudra;
+
+ if (Utils.isInKuudra() && loaded) {
+ if (config.supplyWaypoints) {
+ for (Waypoint waypoint : supplyWaypoints) {
+ waypoint.render(context);
+ }
+ }
+
+ if (config.ballistaBuildWaypoints) {
+ for (Waypoint waypoint : ballistaBuildWaypoints) {
+ waypoint.render(context);
+ }
+ }
+
+ if (config.fuelWaypoints) {
+ for (Waypoint waypoint : fuelWaypoints) {
+ waypoint.render(context);
+ }
+ }
+
+ if (config.safeSpotWaypoints) {
+ for (Waypoint waypoint : SAFE_SPOT_WAYPOINTS) {
+ waypoint.render(context);
+ }
+ }
+
+ //TODO maybe have "dynamic" waypoints that draw a line to the actual spot
+ if (config.pearlWaypoints) {
+ for (Waypoint waypoint : PEARL_WAYPOINTS) {
+ waypoint.render(context);
+ }
+ }
+ }
+ }
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
index 0438a8ce..3aa62a3b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.entity;
import com.google.common.collect.Streams;
import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager;
+import de.hysky.skyblocker.skyblock.crimson.kuudra.KuudraGlow;
import de.hysky.skyblocker.skyblock.dungeon.LividColor;
import de.hysky.skyblocker.skyblock.end.TheEnd;
import de.hysky.skyblocker.utils.ItemUtils;
@@ -12,6 +13,7 @@ import de.hysky.skyblocker.utils.render.culling.OcclusionCulling;
import net.minecraft.entity.Entity;
import net.minecraft.entity.decoration.ArmorStandEntity;
import net.minecraft.entity.mob.EndermanEntity;
+import net.minecraft.entity.mob.MagmaCubeEntity;
import net.minecraft.entity.mob.ZombieEntity;
import net.minecraft.entity.passive.BatEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -67,6 +69,9 @@ public class MobGlow {
//dojo
case ZombieEntity zombie when Utils.isInCrimson() && DojoManager.inArena -> DojoManager.shouldGlow(getArmorStandName(zombie));
+ //Kuudra
+ case MagmaCubeEntity magmaCube when Utils.isInKuudra() -> KuudraGlow.shouldGlow(magmaCube, name);
+
default -> false;
};
}
@@ -120,6 +125,7 @@ public class MobGlow {
case EndermanEntity enderman when TheEnd.isSpecialZealot(enderman) -> Formatting.RED.getColorValue();
case ArmorStandEntity armorStand when isNukekubiHead(armorStand) -> Formatting.GREEN.getColorValue();
case ZombieEntity zombie when Utils.isInCrimson() && DojoManager.inArena -> DojoManager.getColor();
+ case MagmaCubeEntity magmaCube when Utils.isInKuudra() -> 0xf7510f;
default -> 0xf57738;
};
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 129381a2..3bf50e0c 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -45,6 +45,8 @@
"skyblocker.config.crimsonIsle.kuudra.arrowPoisonThreshold.@Tooltip": "If the amount of Toxic Arrow Poison you have in your inventory is below the set threshold, then you will receive a warning.\n\n16 is the absolute minimum.\nYou want 32 for smooth 'DPS' phase with prefire.",
"skyblocker.config.crimsonIsle.kuudra.ballistaBuildWaypoints": "Ballista Build Spot Waypoints",
"skyblocker.config.crimsonIsle.kuudra.fuelWaypoints": "Fuel Waypoints",
+ "skyblocker.config.crimsonIsle.kuudra.kuudraGlow": "Kuudra Glow",
+ "skyblocker.config.crimsonIsle.kuudra.kuudraGlow.@Tooltip": "Outlines Kuudra in a deep orange.",
"skyblocker.config.crimsonIsle.kuudra.noArrowPoisonWarning": "No Arrow Poison Warning",
"skyblocker.config.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip": "Warns you when you pull out a bow and have no Toxic Arrow Poison in your inventory. Only works during the DPS phase.",
"skyblocker.config.crimsonIsle.kuudra.pearlWaypoints": "Pearl Waypoints",