diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/end')
4 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java index 659fc79f..4540ce6e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java @@ -17,12 +17,12 @@ public class EndHudConfigScreen extends HudConfigScreen { @SuppressWarnings("SuspiciousNameCombination") @Override protected List<IntIntMutablePair> getConfigPos(SkyblockerConfig config) { - return List.of(IntIntMutablePair.of(config.locations.end.x, config.locations.end.y)); + return List.of(IntIntMutablePair.of(config.otherLocations.end.x, config.otherLocations.end.y)); } @Override protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) { - configManager.locations.end.x = widgets.get(0).getX(); - configManager.locations.end.y = widgets.get(0).getY(); + configManager.otherLocations.end.x = widgets.getFirst().getX(); + configManager.otherLocations.end.y = widgets.getFirst().getY(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java index ca3c8cd8..53c4336e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java @@ -37,15 +37,15 @@ public class EndHudWidget extends Widget { ENDERMAN_HEAD.set(DataComponentTypes.PROFILE, new ProfileComponent(Optional.of("MHF_Enderman"), Optional.empty(), new PropertyMap())); POPPY.addEnchantment(Enchantments.INFINITY, 1); - INSTANCE.setX(SkyblockerConfigManager.get().locations.end.x); - INSTANCE.setY(SkyblockerConfigManager.get().locations.end.y); + INSTANCE.setX(SkyblockerConfigManager.get().otherLocations.end.x); + INSTANCE.setY(SkyblockerConfigManager.get().otherLocations.end.y); } @Override public void updateContent() { // Zealots - if (SkyblockerConfigManager.get().locations.end.zealotKillsEnabled) { + if (SkyblockerConfigManager.get().otherLocations.end.zealotKillsEnabled) { addComponent(new IcoTextComponent(ENDERMAN_HEAD, Text.literal("Zealots").formatted(Formatting.BOLD))); addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsSinceLastEye", TheEnd.zealotsSinceLastEye))); addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.zealotsTotalKills", TheEnd.zealotsKilled))); @@ -57,7 +57,7 @@ public class EndHudWidget extends Widget { } // Endstone protector - if (SkyblockerConfigManager.get().locations.end.protectorLocationEnabled) { + if (SkyblockerConfigManager.get().otherLocations.end.protectorLocationEnabled) { addComponent(new IcoTextComponent(POPPY, Text.literal("Endstone Protector").formatted(Formatting.BOLD))); if (TheEnd.stage == 5) { addComponent(new PlainTextComponent(Text.translatable("skyblocker.end.hud.stage", "IMMINENT"))); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java index b4af7256..b0282a69 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java @@ -98,7 +98,7 @@ public class EnderNodes { } private static boolean shouldProcess() { - return SkyblockerConfigManager.get().locations.end.enableEnderNodeHelper && Utils.isInTheEnd(); + return SkyblockerConfigManager.get().otherLocations.end.enableEnderNodeHelper && Utils.isInTheEnd(); } private static void reset() { @@ -117,7 +117,7 @@ public class EnderNodes { private long lastConfirmed; private EnderNode(BlockPos pos) { - super(pos, () -> SkyblockerConfigManager.get().general.waypoints.waypointType, DyeColor.CYAN.getColorComponents(), false); + super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, DyeColor.CYAN.getColorComponents(), false); } private void updateParticles() { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java index 6f2a0e40..fa36b185 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/TheEnd.java @@ -75,9 +75,9 @@ public class TheEnd { HudRenderEvents.AFTER_MAIN_HUD.register((drawContext, tickDelta) -> { if (!Utils.isInTheEnd()) return; - if (!SkyblockerConfigManager.get().locations.end.hudEnabled) return; + if (!SkyblockerConfigManager.get().otherLocations.end.hudEnabled) return; - EndHudWidget.INSTANCE.render(drawContext, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + EndHudWidget.INSTANCE.render(drawContext, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground); }); ClientChunkEvents.CHUNK_LOAD.register((world, chunk) -> { @@ -261,7 +261,7 @@ public class TheEnd { } private static void renderWaypoint(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().locations.end.waypoint) return; + if (!SkyblockerConfigManager.get().otherLocations.end.waypoint) return; if (currentProtectorLocation == null || stage != 5) return; currentProtectorLocation.waypoint().render(context); } |