Merge pull request #91 from bowser0000/developmentv1.8.6

1.8.6

1 files changed, 208 insertions, 0 deletions

diff --git a/src/main/java/me/Danker/features/SkillTracker.java b/src/main/java/me/Danker/features/SkillTracker.java
new file mode 100644
index 0000000..60eb632
--- /dev/null
+++ b/src/main/java/me/Danker/features/SkillTracker.java
@@ -0,0 +1,208 @@
+package me.Danker.features;
+
+import me.Danker.DankersSkyblockMod;
+import me.Danker.commands.MoveCommand;
+import me.Danker.commands.ScaleCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.events.RenderOverlay;
+import me.Danker.handlers.TextRenderer;
+import me.Danker.utils.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.inventory.GuiChest;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
+import org.apache.commons.lang3.time.StopWatch;
+
+import java.text.NumberFormat;
+import java.util.Locale;
+
+public class SkillTracker {
+
+    static String lastSkill = "Farming";
+    public static boolean showSkillTracker;
+    public static StopWatch skillStopwatch = new StopWatch();
+    static double farmingXP = 0;
+    public static double farmingXPGained = 0;
+    static double miningXP = 0;
+    public static double miningXPGained = 0;
+    static double combatXP = 0;
+    public static double combatXPGained = 0;
+    static double foragingXP = 0;
+    public static double foragingXPGained = 0;
+    static double fishingXP = 0;
+    public static double fishingXPGained = 0;
+    static double enchantingXP = 0;
+    public static double enchantingXPGained = 0;
+    static double alchemyXP = 0;
+    public static double alchemyXPGained = 0;
+    static double xpLeft = 0;
+    static double timeSinceGained = 0;
+    public static String SKILL_TRACKER_COLOUR;
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public void onChat(ClientChatReceivedEvent event) {
+        if (!Utils.inSkyblock || event.type != 2) return;
+
+        String[] actionBarSections = event.message.getUnformattedText().split(" {3,}");
+
+        for (String section : actionBarSections) {
+            if (section.contains("+") && section.contains("/") && section.contains("(")) {
+                if (!section.contains("Runecrafting") && !section.contains("Carpentry")) {
+                    if (ToggleCommand.autoSkillTrackerToggled && System.currentTimeMillis() / 1000 - timeSinceGained <= 2) {
+                        if (skillStopwatch.isStarted() && skillStopwatch.isSuspended()) {
+                            skillStopwatch.resume();
+                        } else if (!skillStopwatch.isStarted()) {
+                            skillStopwatch.start();
+                        }
+                    }
+                    timeSinceGained = System.currentTimeMillis() / 1000;
+
+                    int limit = section.contains("Farming") || section.contains("Enchanting") || section.contains("Mining") || section.contains("Combat") ? 60 : 50;
+                    double currentXP = Double.parseDouble(section.substring(section.indexOf("(") + 1, section.indexOf("/")).replace(",", ""));
+                    int xpToLevelUp = Integer.parseInt(section.substring(section.indexOf("/") + 1, section.indexOf(")")).replaceAll(",", ""));
+                    xpLeft = xpToLevelUp - currentXP;
+                    int previousXP = Utils.getPastXpEarned(xpToLevelUp, limit);
+                    double totalXP = currentXP + previousXP;
+
+                    String skill = section.substring(section.indexOf(" ") + 1, section.lastIndexOf(" "));
+                    switch (skill) {
+                        case "Farming":
+                            lastSkill = "Farming";
+                            if (farmingXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) farmingXPGained += totalXP - farmingXP;
+                            }
+                            farmingXP = totalXP;
+                            break;
+                        case "Mining":
+                            lastSkill = "Mining";
+                            if (miningXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) miningXPGained += totalXP - miningXP;
+                            }
+                            miningXP = totalXP;
+                            break;
+                        case "Combat":
+                            lastSkill = "Combat";
+                            if (combatXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) combatXPGained += totalXP - combatXP;
+                            }
+                            combatXP = totalXP;
+                            break;
+                        case "Foraging":
+                            lastSkill = "Foraging";
+                            if (foragingXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) foragingXPGained += totalXP - foragingXP;
+                            }
+                            foragingXP = totalXP;
+                            break;
+                        case "Fishing":
+                            lastSkill = "Fishing";
+                            if (fishingXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) fishingXPGained += totalXP - fishingXP;
+                            }
+                            fishingXP = totalXP;
+                            break;
+                        case "Enchanting":
+                            lastSkill = "Enchanting";
+                            if (enchantingXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) enchantingXPGained += totalXP - enchantingXP;
+                            }
+                            enchantingXP = totalXP;
+                            break;
+                        case "Alchemy":
+                            lastSkill = "Alchemy";
+                            if (alchemyXP != 0) {
+                                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) alchemyXPGained += totalXP - alchemyXP;
+                            }
+                            alchemyXP = totalXP;
+                            break;
+                        default:
+                            System.err.println("Unknown skill.");
+                    }
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public void renderPlayerInfo(RenderOverlay event) {
+        if (showSkillTracker && Utils.inSkyblock) {
+            int xpPerHour;
+            double xpToShow = 0;
+            switch (lastSkill) {
+                case "Farming":
+                    xpToShow = farmingXPGained;
+                    break;
+                case "Mining":
+                    xpToShow = miningXPGained;
+                    break;
+                case "Combat":
+                    xpToShow = combatXPGained;
+                    break;
+                case "Foraging":
+                    xpToShow = foragingXPGained;
+                    break;
+                case "Fishing":
+                    xpToShow = fishingXPGained;
+                    break;
+                case "Enchanting":
+                    xpToShow = enchantingXPGained;
+                    break;
+                case "Alchemy":
+                    xpToShow = alchemyXPGained;
+                    break;
+                default:
+                    System.err.println("Unknown skill in rendering.");
+            }
+            xpPerHour = (int) Math.round(xpToShow / ((skillStopwatch.getTime() + 1) / 3600000d));
+            String skillTrackerText = SKILL_TRACKER_COLOUR + lastSkill + " XP Earned: " + NumberFormat.getNumberInstance(Locale.US).format(xpToShow) + "\n" +
+                    SKILL_TRACKER_COLOUR + "Time Elapsed: " + Utils.getTimeBetween(0, skillStopwatch.getTime() / 1000d) + "\n" +
+                    SKILL_TRACKER_COLOUR + "XP Per Hour: " + NumberFormat.getIntegerInstance(Locale.US).format(xpPerHour);
+            if (xpLeft >= 0) {
+                String time = xpPerHour == 0 ? "Never" : Utils.getTimeBetween(0, xpLeft / (xpPerHour / 3600D));
+                skillTrackerText += "\n" + SKILL_TRACKER_COLOUR + "Time Until Next Level: " + time;
+            }
+            if (!skillStopwatch.isStarted() || skillStopwatch.isSuspended()) {
+                skillTrackerText += "\n" + EnumChatFormatting.RED + "PAUSED";
+            }
+
+            new TextRenderer(Minecraft.getMinecraft(), skillTrackerText, MoveCommand.skillTrackerXY[0], MoveCommand.skillTrackerXY[1], ScaleCommand.skillTrackerScale);
+        }
+    }
+
+    @SubscribeEvent
+    public void onKey(InputEvent.KeyInputEvent event) {
+        if (!Utils.inSkyblock) return;
+
+        EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
+        if (DankersSkyblockMod.keyBindings[2].isPressed()) {
+            if (skillStopwatch.isStarted() && skillStopwatch.isSuspended()) {
+                skillStopwatch.resume();
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker started."));
+            } else if (!skillStopwatch.isStarted()) {
+                skillStopwatch.start();
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker started."));
+            } else if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) {
+                skillStopwatch.suspend();
+                player.addChatMessage(new ChatComponentText(DankersSkyblockMod.MAIN_COLOUR + "Skill tracker paused."));
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public void onGuiOpen(GuiOpenEvent event) {
+        if (event.gui instanceof GuiChest) {
+            if (ToggleCommand.autoSkillTrackerToggled) {
+                if (skillStopwatch.isStarted() && !skillStopwatch.isSuspended()) {
+                    skillStopwatch.suspend();
+                }
+            }
+        }
+    }
+
+}