From e81be5283360c6cf118c3b663b3d58df4dba10fd Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 23:10:38 +0100 Subject: fix to work with new config --- src/main/resources/assets/skyblocker/lang/en_us.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 283175d0..748841ad 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -397,6 +397,22 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", + "skyblocker.config.mining.commissionWaypoints": "Commission Waypoints", + "skyblocker.config.mining.commissionWaypoints.mode": "Enable Commission Waypoints", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[0]": "Off: Do not show Commission waypoint.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[1]": "\nDwarven: Show waypoints only in dwarven mines.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[2]": "\nGlacite: Show waypoints only in glacite tunnles.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[3]": "\nBoth: Show waypoints in dwarven mines and glacite tunnels.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[4]": "\n(takes effect when commissions updated)", + "skyblocker.config.mining.commissionWaypoints.useColor": "Colored Waypoints", + "skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip": "Color the waypoint text to match the block it's for (takes effect when commissions updated).", + "skyblocker.config.mining.commissionWaypoints.textScale": "Text Scale", + "skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", + "skyblocker.config.mining.commissionWaypoints.showBaseCamp": "Show Basecamp Waypoint", + "skyblocker.config.mining.commissionWaypoints.showBaseCamp.@Tooltip": "Show waypoint for basecamp when in glacite tunnels (takes effect when commissions updated).", + "skyblocker.config.mining.commissionWaypoints.showEmissary": "Show Emissary", + "skyblocker.config.mining.commissionWaypoints.showEmissary.@Tooltip": "When a commission in the dwarven mines is finished show emissary locations (takes effect when commissions updated).", + "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", "skyblocker.config.mining.dwarvenHud.enabledPowder": "Enable Powder", -- cgit From 100104f84dd53cf15d1252f8f79fd63ba2bde185 Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 10 May 2024 21:31:55 +0100 Subject: fix formmating problems --- .../skyblock/dwarven/CommissionLabels.java | 18 ++++++------ .../skyblock/dwarven/MiningLocationLabel.java | 12 ++++---- .../resources/assets/skyblocker/lang/en_us.json | 32 +++++++++++----------- 3 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java index d8b40c43..3d7c2c00 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java @@ -13,9 +13,9 @@ import java.util.stream.Collectors; public class CommissionLabels { - private static final Map DWARVEN_LOCATIONS = Arrays.stream(MiningLocationLabel.dwarvenCategory.values()).collect(Collectors.toMap(MiningLocationLabel.dwarvenCategory::toString, Function.identity())); - private static final List DWARVEN_EMISSARYS = Arrays.stream(MiningLocationLabel.dwarvenEmissaries.values()).toList(); - private static final Map GLACITE_LOCATIONS = Arrays.stream(MiningLocationLabel.glaciteCategory.values()).collect(Collectors.toMap(MiningLocationLabel.glaciteCategory::toString, Function.identity())); + private static final Map DWARVEN_LOCATIONS = Arrays.stream(MiningLocationLabel.DwarvenCategory.values()).collect(Collectors.toMap(MiningLocationLabel.DwarvenCategory::toString, Function.identity())); + private static final List DWARVEN_EMISSARIES = Arrays.stream(MiningLocationLabel.DwarvenEmissaries.values()).toList(); + private static final Map GLACITE_LOCATIONS = Arrays.stream(MiningLocationLabel.GlaciteCategory.values()).collect(Collectors.toMap(MiningLocationLabel.GlaciteCategory::toString, Function.identity())); protected static List activeWaypoints = new ArrayList<>(); @@ -43,9 +43,9 @@ public class CommissionLabels { } for (String commission : newCommissions) { - for (Map.Entry glaciteLocation : GLACITE_LOCATIONS.entrySet()) { + for (Map.Entry glaciteLocation : GLACITE_LOCATIONS.entrySet()) { if (commission.contains(glaciteLocation.getKey())) { - MiningLocationLabel.glaciteCategory category = glaciteLocation.getValue(); + MiningLocationLabel.GlaciteCategory category = glaciteLocation.getValue(); for (BlockPos gemstoneLocation : category.getLocations()) { activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation)); } @@ -54,7 +54,7 @@ public class CommissionLabels { } //add base waypoint if enabled if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) { - activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.glaciteCategory.CAMPFIRE, MiningLocationLabel.glaciteCategory.CAMPFIRE.getLocations()[0])); + activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0])); } return; } @@ -64,9 +64,9 @@ public class CommissionLabels { } for (String commission : newCommissions) { - for (Map.Entry dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) { + for (Map.Entry dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) { if (commission.contains(dwarvenLocation.getKey())) { - MiningLocationLabel.dwarvenCategory category = dwarvenLocation.getValue(); + MiningLocationLabel.DwarvenCategory category = dwarvenLocation.getValue(); category.isTitanium = commission.contains("Titanium"); activeWaypoints.add(new MiningLocationLabel(category, category.getLocation())); } @@ -74,7 +74,7 @@ public class CommissionLabels { } //if there is a commission completed and enabled show emissary if (SkyblockerConfigManager.get().mining.commissionWaypoints.showEmissary && completed) { - for (MiningLocationLabel.dwarvenEmissaries emissaries : DWARVEN_EMISSARYS) { + for (MiningLocationLabel.DwarvenEmissaries emissaries : DWARVEN_EMISSARIES) { activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation())); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java index d41318ad..7d565386 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java @@ -43,7 +43,7 @@ public class MiningLocationLabel { int getColor(); //all the color codes are the color of the block the waypoint is for } - enum dwarvenCategory implements Category { + enum DwarvenCategory implements Category { LAVA_SPRINGS("Lava Springs", new BlockPos(60, 197, -15)), CLIFFSIDE_VEINS("Cliffside Veins", new BlockPos(40, 128, 40)), RAMPARTS_QUARRY("Rampart's Quarry", new BlockPos(-100, 150, -20)), @@ -56,7 +56,7 @@ public class MiningLocationLabel { private final String name; private final BlockPos location; - dwarvenCategory(String name, BlockPos location) { + DwarvenCategory(String name, BlockPos location) { this.name = name; this.location = location; } @@ -84,7 +84,7 @@ public class MiningLocationLabel { } } - enum dwarvenEmissaries implements Category { + enum DwarvenEmissaries implements Category { LAVA_SPRINGS(new BlockPos(58, 198, -8)), CLIFFSIDE_VEINS(new BlockPos(42, 134, 22)), RAMPARTS_QUARRY(new BlockPos(-72, 153, -10)), @@ -95,7 +95,7 @@ public class MiningLocationLabel { private final BlockPos location; - dwarvenEmissaries( BlockPos location) { + DwarvenEmissaries(BlockPos location) { this.location = location; } @@ -120,7 +120,7 @@ public class MiningLocationLabel { } } - enum glaciteCategory implements Category { + enum GlaciteCategory implements Category { AQUAMARINE("Aquamarine", 0x334cb1, new BlockPos[]{new BlockPos(-1, 139, 437), new BlockPos(90, 151, 229), new BlockPos(56, 151, 400), new BlockPos(51, 117, 303)}), ONYX("Onyx", 0x191919, new BlockPos[]{new BlockPos(79, 119, 411), new BlockPos(-14, 132, 386), new BlockPos(18, 136, 370), new BlockPos(16, 138, 411), new BlockPos(-68, 130, 408)}), PERIDOT("Peridot", 0x667f33, new BlockPos[]{new BlockPos(-61, 147, 302), new BlockPos(91, 122, 397), new BlockPos(-73, 122, 458), new BlockPos(-77, 120, 282)}), @@ -131,7 +131,7 @@ public class MiningLocationLabel { private final int color; private final BlockPos[] location; - glaciteCategory(String name, int color, BlockPos[] location) { + GlaciteCategory(String name, int color, BlockPos[] location) { this.name = name; this.color = color; this.location = location; diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 748841ad..07502b7f 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -377,6 +377,22 @@ "skyblocker.config.mining": "Mining", + "skyblocker.config.mining.commissionWaypoints": "Commission Waypoints", + "skyblocker.config.mining.commissionWaypoints.mode": "Enable Commission Waypoints", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[0]": "Off: Do not show Commission waypoint.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[1]": "\nDwarven: Show waypoints only in dwarven mines.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[2]": "\nGlacite: Show waypoints only in glacite tunnles.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[3]": "\nBoth: Show waypoints in dwarven mines and glacite tunnels.", + "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[4]": "\n(takes effect when commissions updated)", + "skyblocker.config.mining.commissionWaypoints.useColor": "Colored Waypoints", + "skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip": "Color the waypoint text to match the block it's for (takes effect when commissions updated).", + "skyblocker.config.mining.commissionWaypoints.textScale": "Text Scale", + "skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", + "skyblocker.config.mining.commissionWaypoints.showBaseCamp": "Show Basecamp Waypoint", + "skyblocker.config.mining.commissionWaypoints.showBaseCamp.@Tooltip": "Show waypoint for basecamp when in glacite tunnels (takes effect when commissions updated).", + "skyblocker.config.mining.commissionWaypoints.showEmissary": "Show Emissary", + "skyblocker.config.mining.commissionWaypoints.showEmissary.@Tooltip": "When a commission in the dwarven mines is finished show emissary locations (takes effect when commissions updated).", + "skyblocker.config.mining.crystalHollows": "Crystal Hollows", "skyblocker.config.mining.crystalHollows.metalDetectorHelper": "Metal Detector Helper", "skyblocker.config.mining.crystalHollows.metalDetectorHelper.@Tooltip": "Helper for the metal detector puzzle in the Mines of Divan.", @@ -397,22 +413,6 @@ "skyblocker.config.mining.crystalsWaypoints.findInChat.@Tooltip": "When in crystal hollows read the chat to see if coordinates are sent and extract these to show as waypoint or on the map", "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.", - "skyblocker.config.mining.commissionWaypoints": "Commission Waypoints", - "skyblocker.config.mining.commissionWaypoints.mode": "Enable Commission Waypoints", - "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[0]": "Off: Do not show Commission waypoint.", - "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[1]": "\nDwarven: Show waypoints only in dwarven mines.", - "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[2]": "\nGlacite: Show waypoints only in glacite tunnles.", - "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[3]": "\nBoth: Show waypoints in dwarven mines and glacite tunnels.", - "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[4]": "\n(takes effect when commissions updated)", - "skyblocker.config.mining.commissionWaypoints.useColor": "Colored Waypoints", - "skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip": "Color the waypoint text to match the block it's for (takes effect when commissions updated).", - "skyblocker.config.mining.commissionWaypoints.textScale": "Text Scale", - "skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", - "skyblocker.config.mining.commissionWaypoints.showBaseCamp": "Show Basecamp Waypoint", - "skyblocker.config.mining.commissionWaypoints.showBaseCamp.@Tooltip": "Show waypoint for basecamp when in glacite tunnels (takes effect when commissions updated).", - "skyblocker.config.mining.commissionWaypoints.showEmissary": "Show Emissary", - "skyblocker.config.mining.commissionWaypoints.showEmissary.@Tooltip": "When a commission in the dwarven mines is finished show emissary locations (takes effect when commissions updated).", - "skyblocker.config.mining.dwarvenHud": "Dwarven HUD", "skyblocker.config.mining.dwarvenHud.enabledCommissions": "Enable Commissions", "skyblocker.config.mining.dwarvenHud.enabledPowder": "Enable Powder", -- cgit From 991988cd92d49dd29a66e82eaf114a9252d0ad69 Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 10 May 2024 21:46:18 +0100 Subject: turn the lables into a record --- .../skyblocker/skyblock/dwarven/CommissionLabels.java | 9 +++++---- .../skyblock/dwarven/MiningLocationLabel.java | 17 +++++------------ src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) (limited to 'src/main/resources/assets/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java index 3d7c2c00..b4f9eb22 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java @@ -5,6 +5,7 @@ import de.hysky.skyblocker.config.configs.MiningConfig; import de.hysky.skyblocker.utils.Utils; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import java.util.*; @@ -47,14 +48,14 @@ public class CommissionLabels { if (commission.contains(glaciteLocation.getKey())) { MiningLocationLabel.GlaciteCategory category = glaciteLocation.getValue(); for (BlockPos gemstoneLocation : category.getLocations()) { - activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation)); + activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation.toCenterPos())); } } } } //add base waypoint if enabled if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) { - activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0])); + activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0].toCenterPos())); } return; } @@ -68,14 +69,14 @@ public class CommissionLabels { if (commission.contains(dwarvenLocation.getKey())) { MiningLocationLabel.DwarvenCategory category = dwarvenLocation.getValue(); category.isTitanium = commission.contains("Titanium"); - activeWaypoints.add(new MiningLocationLabel(category, category.getLocation())); + activeWaypoints.add(new MiningLocationLabel(category, category.getLocation().toCenterPos())); } } } //if there is a commission completed and enabled show emissary if (SkyblockerConfigManager.get().mining.commissionWaypoints.showEmissary && completed) { for (MiningLocationLabel.DwarvenEmissaries emissaries : DWARVEN_EMISSARIES) { - activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation())); + activeWaypoints.add(new MiningLocationLabel(emissaries, emissaries.getLocation().toCenterPos())); } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java index 7d565386..45462400 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/MiningLocationLabel.java @@ -9,20 +9,13 @@ import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -public class MiningLocationLabel { - final Text name; - final Category category; - private final Vec3d centerPos; +public record MiningLocationLabel (Category category, Vec3d centerPos){ - MiningLocationLabel(Category category, BlockPos pos) { + private Text getName() { if (SkyblockerConfigManager.get().mining.commissionWaypoints.useColor) { - this.name = Text.literal(category.getName()).withColor(category.getColor()); - } else { - this.name = Text.literal(category.getName()); + return Text.literal(category.getName()).withColor(category.getColor()); } - - this.category = category; - this.centerPos = pos.toCenterPos(); + return Text.literal(category.getName()); } /** @@ -33,7 +26,7 @@ public class MiningLocationLabel { Vec3d posUp = centerPos.add(0, 1, 0); double distance = context.camera().getPos().distanceTo(centerPos); float scale = (float) (SkyblockerConfigManager.get().mining.commissionWaypoints.textScale * (distance / 10)); - RenderHelper.renderText(context, name, posUp, scale, true); + RenderHelper.renderText(context, getName(), posUp, scale, true); RenderHelper.renderText(context, Text.literal(Math.round(distance) + "m").formatted(Formatting.YELLOW), posUp, scale, MinecraftClient.getInstance().textRenderer.fontHeight + 1, true); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 07502b7f..c5ebd9d4 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -385,7 +385,7 @@ "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[3]": "\nBoth: Show waypoints in dwarven mines and glacite tunnels.", "skyblocker.config.mining.commissionWaypoints.mode.@Tooltip[4]": "\n(takes effect when commissions updated)", "skyblocker.config.mining.commissionWaypoints.useColor": "Colored Waypoints", - "skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip": "Color the waypoint text to match the block it's for (takes effect when commissions updated).", + "skyblocker.config.mining.commissionWaypoints.useColor.@Tooltip": "Color the waypoint text to match the block it's for.", "skyblocker.config.mining.commissionWaypoints.textScale": "Text Scale", "skyblocker.config.mining.commissionWaypoints.textScale.@Tooltip": "Scale the size of the commission labels.", "skyblocker.config.mining.commissionWaypoints.showBaseCamp": "Show Basecamp Waypoint", -- cgit