-
-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #690 from olim88/mining-features
add waypoints for commissions in dwarven mines and glacite.
- Loading branch information
Showing
9 changed files
with
368 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
src/main/java/de/hysky/skyblocker/skyblock/dwarven/CommissionLabels.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package de.hysky.skyblocker.skyblock.dwarven; | ||
|
|
||
| import de.hysky.skyblocker.config.SkyblockerConfigManager; | ||
| 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.util.math.BlockPos; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class CommissionLabels { | ||
|
|
||
| private static final Map<String, MiningLocationLabel.DwarvenCategory> DWARVEN_LOCATIONS = Arrays.stream(MiningLocationLabel.DwarvenCategory.values()).collect(Collectors.toMap(MiningLocationLabel.DwarvenCategory::toString, Function.identity())); | ||
| private static final List<MiningLocationLabel.DwarvenEmissaries> DWARVEN_EMISSARIES = Arrays.stream(MiningLocationLabel.DwarvenEmissaries.values()).toList(); | ||
| private static final Map<String, MiningLocationLabel.GlaciteCategory> GLACITE_LOCATIONS = Arrays.stream(MiningLocationLabel.GlaciteCategory.values()).collect(Collectors.toMap(MiningLocationLabel.GlaciteCategory::toString, Function.identity())); | ||
|
|
||
| protected static List<MiningLocationLabel> activeWaypoints = new ArrayList<>(); | ||
|
|
||
| public static void init() { | ||
| WorldRenderEvents.AFTER_TRANSLUCENT.register(CommissionLabels::render); | ||
| } | ||
|
|
||
| /** | ||
| * update the activeWaypoints when there is a change in commissions | ||
| * | ||
| * @param newCommissions the new commissions to get the waypoints from | ||
| * @param completed if there is a commission completed | ||
| */ | ||
| protected static void update(List<String> newCommissions, boolean completed) { | ||
| MiningConfig.CommissionWaypointMode currentMode = SkyblockerConfigManager.get().mining.commissionWaypoints.mode; | ||
| if (currentMode == MiningConfig.CommissionWaypointMode.OFF) { | ||
| return; | ||
| } | ||
| activeWaypoints.clear(); | ||
| String location = Utils.getIslandArea().substring(2); | ||
| //find commission locations in glacite | ||
| if (location.equals("Dwarven Base Camp") || location.equals("Glacite Tunnels") || location.equals("Glacite Mineshafts") || location.equals("Glacite Lake")) { | ||
| if (currentMode != MiningConfig.CommissionWaypointMode.BOTH && currentMode != MiningConfig.CommissionWaypointMode.GLACITE) { | ||
| return; | ||
| } | ||
|
|
||
| for (String commission : newCommissions) { | ||
| for (Map.Entry<String, MiningLocationLabel.GlaciteCategory> glaciteLocation : GLACITE_LOCATIONS.entrySet()) { | ||
| if (commission.contains(glaciteLocation.getKey())) { | ||
| MiningLocationLabel.GlaciteCategory category = glaciteLocation.getValue(); | ||
| for (BlockPos gemstoneLocation : category.getLocations()) { | ||
| activeWaypoints.add(new MiningLocationLabel(category, gemstoneLocation)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| //add base waypoint if enabled | ||
| if (SkyblockerConfigManager.get().mining.commissionWaypoints.showBaseCamp) { | ||
| activeWaypoints.add(new MiningLocationLabel(MiningLocationLabel.GlaciteCategory.CAMPFIRE, MiningLocationLabel.GlaciteCategory.CAMPFIRE.getLocations()[0])); | ||
| } | ||
| return; | ||
| } | ||
| //find commission locations in dwarven mines | ||
| if (currentMode != MiningConfig.CommissionWaypointMode.BOTH && currentMode != MiningConfig.CommissionWaypointMode.DWARVEN) { | ||
| return; | ||
| } | ||
|
|
||
| for (String commission : newCommissions) { | ||
| for (Map.Entry<String, MiningLocationLabel.DwarvenCategory> dwarvenLocation : DWARVEN_LOCATIONS.entrySet()) { | ||
| if (commission.contains(dwarvenLocation.getKey())) { | ||
| MiningLocationLabel.DwarvenCategory category = dwarvenLocation.getValue(); | ||
| category.isTitanium = commission.contains("Titanium"); | ||
| activeWaypoints.add(new MiningLocationLabel(category, category.getLocation())); | ||
| } | ||
| } | ||
| } | ||
| //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())); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * render all the active waypoints | ||
| * | ||
| * @param context render context | ||
| */ | ||
| private static void render(WorldRenderContext context) { | ||
| if (!Utils.isInDwarvenMines() || SkyblockerConfigManager.get().mining.commissionWaypoints.mode == MiningConfig.CommissionWaypointMode.OFF) { | ||
| return; | ||
| } | ||
| for (MiningLocationLabel MiningLocationLabel : activeWaypoints) { | ||
| MiningLocationLabel.render(context); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.