From 3a53e51494523871870491617ae6add9b3fe87fe Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:46:56 -0400 Subject: 1.21 --- .../java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java | 9 +++++---- src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java | 8 ++++---- .../de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/rift') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java index 11963857..ef77c602 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.skyblock.rift; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.utils.ColorUtils; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.render.RenderHelper; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; @@ -26,6 +27,7 @@ public class EffigyWaypoints { new BlockPos(240, 129, 118) //Effigy 6 ); private static final List UNBROKEN_EFFIGIES = new ArrayList<>(); + private static final float[] RED = ColorUtils.getFloatComponents(DyeColor.RED); protected static void updateEffigies() { if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) return; @@ -57,13 +59,12 @@ public class EffigyWaypoints { protected static void render(WorldRenderContext context) { if (SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints && Utils.getIslandArea().contains("Stillgore Château")) { for (BlockPos effigy : UNBROKEN_EFFIGIES) { - float[] colorComponents = DyeColor.RED.getColorComponents(); if (SkyblockerConfigManager.get().slayers.vampireSlayer.compactEffigyWaypoints) { - RenderHelper.renderFilledWithBeaconBeam(context, effigy.down(6), colorComponents, 0.5F, true); + RenderHelper.renderFilledWithBeaconBeam(context, effigy.down(6), RED, 0.5F, true); } else { - RenderHelper.renderFilledWithBeaconBeam(context, effigy, colorComponents, 0.5F, true); + RenderHelper.renderFilledWithBeaconBeam(context, effigy, RED, 0.5F, true); for (int i = 1; i < 6; i++) { - RenderHelper.renderFilled(context, effigy.down(i), colorComponents, 0.5F - (0.075F * i), true); + RenderHelper.renderFilled(context, effigy.down(i), RED, 0.5F - (0.075F * i), true); } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java index 039d331c..8e3d1a91 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EnigmaSouls.java @@ -7,9 +7,9 @@ import com.google.gson.JsonParser; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import de.hysky.skyblocker.SkyblockerMod; -import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.configs.OtherLocationsConfig; +import de.hysky.skyblocker.utils.ColorUtils; import de.hysky.skyblocker.utils.Constants; import de.hysky.skyblocker.utils.PosUtils; import de.hysky.skyblocker.utils.Utils; @@ -43,11 +43,11 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit public class EnigmaSouls { private static final Logger LOGGER = LoggerFactory.getLogger(EnigmaSouls.class); private static final Supplier TYPE_SUPPLIER = () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType; - private static final Identifier WAYPOINTS_JSON = new Identifier(SkyblockerMod.NAMESPACE, "rift/enigma_soul_waypoints.json"); + private static final Identifier WAYPOINTS_JSON = Identifier.of(SkyblockerMod.NAMESPACE, "rift/enigma_soul_waypoints.json"); private static final Map SOUL_WAYPOINTS = new HashMap<>(42); private static final Path FOUND_SOULS_FILE = SkyblockerMod.CONFIG_DIR.resolve("found_enigma_souls.json"); - private static final float[] GREEN = DyeColor.GREEN.getColorComponents(); - private static final float[] RED = DyeColor.RED.getColorComponents(); + private static final float[] GREEN = ColorUtils.getFloatComponents(DyeColor.GREEN); + private static final float[] RED = ColorUtils.getFloatComponents(DyeColor.RED); private static CompletableFuture soulsLoaded; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java index 7d7d0c34..6a366122 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/MirrorverseWaypoints.java @@ -5,6 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; +import de.hysky.skyblocker.utils.ColorUtils; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.waypoint.Waypoint; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; @@ -23,11 +24,11 @@ import java.util.function.Supplier; public class MirrorverseWaypoints { private static final Logger LOGGER = LoggerFactory.getLogger("skyblocker"); private static final Supplier WAYPOINT_TYPE = () -> Waypoint.Type.HIGHLIGHT; - private static final Identifier WAYPOINTS_JSON = new Identifier(SkyblockerMod.NAMESPACE, "rift/mirrorverse_waypoints.json"); + private static final Identifier WAYPOINTS_JSON = Identifier.of(SkyblockerMod.NAMESPACE, "rift/mirrorverse_waypoints.json"); private static Waypoint[] LAVA_PATH_WAYPOINTS; private static Waypoint[] UPSIDE_DOWN_WAYPOINTS; private static Waypoint[] TURBULATOR_WAYPOINTS; - private static final float[] COLOR_COMPONENTS = DyeColor.RED.getColorComponents(); + private static final float[] COLOR_COMPONENTS = ColorUtils.getFloatComponents(DyeColor.RED); private static CompletableFuture waypointsLoaded; -- cgit