aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Danker/TheMod.java440
-rw-r--r--me/Danker/TheMod.java268
-rw-r--r--me/Danker/commands/DisplayCommand.java (renamed from Danker/commands/DisplayCommand.java)0
-rw-r--r--me/Danker/commands/GetkeyCommand.java (renamed from Danker/commands/GetkeyCommand.java)0
-rw-r--r--me/Danker/commands/LootCommand.java (renamed from Danker/commands/LootCommand.java)0
-rw-r--r--me/Danker/commands/ReloadConfigCommand.java (renamed from Danker/commands/ReloadConfigCommand.java)0
-rw-r--r--me/Danker/commands/SetkeyCommand.java (renamed from Danker/commands/SetkeyCommand.java)0
-rw-r--r--me/Danker/commands/ToggleCommand.java (renamed from Danker/commands/ToggleCommand.java)0
-rw-r--r--me/Danker/handlers/ConfigHandler.java (renamed from Danker/handlers/ConfigHandler.java)0
-rw-r--r--me/Danker/handlers/ScoreboardHandler.java (renamed from Danker/handlers/ScoreboardHandler.java)0
-rw-r--r--me/Danker/handlers/TextRenderer.java (renamed from Danker/handlers/TextRenderer.java)0
11 files changed, 189 insertions, 519 deletions
diff --git a/Danker/TheMod.java b/Danker/TheMod.java
deleted file mode 100644
index 3e9791b..0000000
--- a/Danker/TheMod.java
+++ /dev/null
@@ -1,440 +0,0 @@
-package me.Danker;
-
-import java.awt.Image;
-import java.awt.SystemTray;
-import java.awt.Toolkit;
-import java.awt.TrayIcon;
-import java.util.List;
-
-import me.Danker.commands.DisplayCommand;
-import me.Danker.commands.GetkeyCommand;
-import me.Danker.commands.LootCommand;
-import me.Danker.commands.ReloadConfigCommand;
-import me.Danker.commands.SetkeyCommand;
-import me.Danker.commands.ToggleCommand;
-import me.Danker.handlers.ConfigHandler;
-import me.Danker.handlers.ScoreboardHandler;
-import me.Danker.handlers.TextRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StringUtils;
-import net.minecraftforge.client.ClientCommandHandler;
-import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.client.event.sound.PlaySoundEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-@Mod(modid = TheMod.MODID, version = TheMod.VERSION, clientSideOnly = true)
-public class TheMod
-{
- public static final String MODID = "Danker's Skyblock Mod";
- public static final String VERSION = "1.4";
-
- static int checkItemsNow = 0;
- static int itemsChecked = 0;
-
- @EventHandler
- public void init(FMLInitializationEvent event)
- {
- FMLCommonHandler.instance().bus().register(this);
- MinecraftForge.EVENT_BUS.register(this);
-
- final ConfigHandler cf = new ConfigHandler();
- cf.reloadConfig();
- }
-
- @EventHandler
- public void preInit(final FMLPreInitializationEvent event) {
- ClientCommandHandler.instance.registerCommand(new ToggleCommand());
- ClientCommandHandler.instance.registerCommand(new SetkeyCommand());
- ClientCommandHandler.instance.registerCommand(new GetkeyCommand());
- ClientCommandHandler.instance.registerCommand(new LootCommand());
- ClientCommandHandler.instance.registerCommand(new ReloadConfigCommand());
- ClientCommandHandler.instance.registerCommand(new DisplayCommand());
- }
-
- @SubscribeEvent
- public void onChat(final ClientChatReceivedEvent event) {
- final ToggleCommand tc = new ToggleCommand();
- final boolean isGPartyToggled = tc.getToggle("gparty");
- String message = event.message.getUnformattedText();
-
- if (!message.contains(":")) {
- if (isGPartyToggled) {
- if (message.contains(" has invited all members of ")) {
- System.out.println(message);
- try {
- final SystemTray tray = SystemTray.getSystemTray();
- final Image image = Toolkit.getDefaultToolkit().createImage("icon.png");
- final TrayIcon trayIcon = new TrayIcon(image, "Guild Party Notifier");
- trayIcon.setImageAutoSize(true);
- trayIcon.setToolTip("Guild Party Notifier");
- tray.add(trayIcon);
- trayIcon.displayMessage("Guild Party", message, TrayIcon.MessageType.INFO);
- tray.remove(trayIcon);
- } catch (Exception ex) {
- System.err.print(ex);
- }
- }
- }
-
- final LootCommand lc = new LootCommand();
- final ConfigHandler cf = new ConfigHandler();
- boolean wolfRNG = false;
- boolean spiderRNG = false;
- boolean zombieRNG = false;
- // T6 books
- if (message.contains("VERY RARE DROP! (Enchanted Book)")) {
- // Loop through scoreboard to see what boss you're doing
- List<String> scoreboard = ScoreboardHandler.getSidebarLines();
- for (String s : scoreboard) {
- String sCleaned = ScoreboardHandler.cleanSB(s);
- if (sCleaned.contains("Sven Packmaster")) {
- lc.wolfBooks++;
- cf.writeIntConfig("wolf", "book", lc.wolfBooks);
- } else if (sCleaned.contains("Tarantula Broodfather")) {
- lc.spiderBooks++;
- cf.writeIntConfig("spider", "book", lc.spiderBooks);
- } else if (sCleaned.contains("Revenant Horror")) {
- lc.zombieBooks++;
- cf.writeIntConfig("zombie", "book", lc.zombieBooks);
- }
- }
- }
-
- // Wolf
- if (message.contains("Talk to Maddox to claim your Wolf Slayer XP!")) {
- lc.wolfSvens++;
- cf.writeIntConfig("wolf", "svens", lc.wolfSvens);
- }
- if (message.contains("VERY RARE DROP! (◆ Spirit Rune ")) {
- lc.wolfSpirits++;
- cf.writeIntConfig("wolf", "spirit", lc.wolfSpirits);
- }
- if (message.contains("CRAZY RARE DROP! (Red Claw Egg)")) {
- wolfRNG = true;
- lc.wolfEggs++;
- cf.writeIntConfig("wolf", "egg", lc.wolfEggs);
- }
- if (message.contains("CRAZY RARE DROP! (◆ Couture Rune")) {
- wolfRNG = true;
- lc.wolfCoutures++;
- cf.writeIntConfig("wolf", "couture", lc.wolfCoutures);
- }
- // How did Skyblock devs even manage to make this item Rename Me
- if (message.contains("CRAZY RARE DROP! (Grizzly Bait)") || message.contains("CRAZY RARE DROP! (Rename Me)")) {
- wolfRNG = true;
- lc.wolfBaits++;
- cf.writeIntConfig("wolf", "bait", lc.wolfBaits);
- }
- if (message.contains("CRAZY RARE DROP! (Overflux Capacitor)")) {
- wolfRNG = true;
- lc.wolfFluxes++;
- cf.writeIntConfig("wolf", "flux", lc.wolfFluxes);
- }
-
- // Spider
- if (message.contains("Talk to Maddox to claim your Spider Slayer XP!")) {
- lc.spiderTarantulas++;
- cf.writeIntConfig("spider", "tarantulas", lc.spiderTarantulas);
- }
-
- if (message.contains("VERY RARE DROP! (◆ Bite Rune")) {
- lc.spiderBites++;
- cf.writeIntConfig("spider", "bite", lc.spiderBites);
- }
- if (message.contains("VERY RARE DROP! (Spider Catalyst)")) {
- lc.spiderCatalysts++;
- cf.writeIntConfig("spider", "catalyst", lc.spiderCatalysts);
- }
- // T3 Spider Book Drop
- if (message.contains("CRAZY RARE DROP! (Enchanted Book)")) {
- lc.spiderBooks++;
- cf.writeIntConfig("spider", "book", lc.spiderBooks);
- }
- if (message.contains("CRAZY RARE DROP! (Fly Swatter)")) {
- spiderRNG = true;
- lc.spiderSwatters++;
- cf.writeIntConfig("spider", "swatter", lc.spiderSwatters);
- }
- if (message.contains("CRAZY RARE DROP! (Tarantula Talisman")) {
- spiderRNG = true;
- lc.spiderTalismans++;
- cf.writeIntConfig("spider", "talisman", lc.spiderTalismans);
- }
- if (message.contains("CRAZY RARE DROP! (Digested Mosquito)")) {
- spiderRNG = true;
- lc.spiderMosquitos++;
- cf.writeIntConfig("spider", "mosquito", lc.spiderMosquitos);
- }
-
- // Zombie
- if (message.contains("Talk to Maddox to claim your Zombie Slayer XP!")) {
- lc.zombieRevs++;
- cf.writeIntConfig("zombie", "revs", lc.zombieRevs);
- }
- // I couldn't find a pic of someone getting this drop, so I'm assuming this works
- if (message.contains("VERY RARE DROP! (Revenant Catalyst)")) {
- lc.zombieRevCatas++;
- cf.writeIntConfig("zombie", "revCatalyst", lc.zombieRevCatas);
- }
- if (message.contains("VERY RARE DROP! (◆ Pestilence Rune")) {
- lc.zombiePestilences++;
- cf.writeIntConfig("zombie", "pestilence", lc.zombiePestilences);
- }
- if (message.contains("VERY RARE DROP! (Undead Catalyst)")) {
- lc.zombieUndeadCatas++;
- cf.writeIntConfig("zombie", "undeadCatalyst", lc.zombieUndeadCatas);
- }
- if (message.contains("CRAZY RARE DROP! (Beheaded Horror)")) {
- zombieRNG = true;
- lc.zombieBeheadeds++;
- cf.writeIntConfig("zombie", "beheaded", lc.zombieBeheadeds);
- }
-
- if (message.contains("CRAZY RARE DROP! (◆ Snake Rune")) {
- zombieRNG = true;
- lc.zombieSnakes++;
- cf.writeIntConfig("zombie", "snake", lc.zombieSnakes);
- }
- if (message.contains("CRAZY RARE DROP! (Scythe Blade)")) {
- zombieRNG = true;
- lc.zombieScythes++;
- cf.writeIntConfig("zombie", "scythe", lc.zombieScythes);
- }
-
- // Time is stored in seconds, so if Skyblock
- // survives until 2038, I'll just update it then
- if (wolfRNG) {
- lc.wolfTime = (int) System.currentTimeMillis() / 1000;
- lc.wolfBosses = 0;
- cf.writeIntConfig("wolf", "timeRNG", lc.wolfTime);
- cf.writeIntConfig("wolf", "bossRNG", 0);
- } else {
- if (lc.wolfBosses != -1) {
- lc.wolfBosses++;
- }
- cf.writeIntConfig("wolf", "bossRNG", lc.wolfBosses);
- }
- if (spiderRNG) {
- lc.spiderTime = (int) System.currentTimeMillis() / 1000;
- lc.spiderBosses = 0;
- cf.writeIntConfig("spider", "timeRNG", lc.spiderTime);
- cf.writeIntConfig("spider", "bossRNG", 0);
- } else {
- if (lc.spiderBosses != -1) {
- lc.spiderBosses++;
- }
- cf.writeIntConfig("spider", "bossRNG", lc.spiderBosses);
- }
- if (zombieRNG) {
- lc.zombieTime = (int) System.currentTimeMillis() / 1000;
- lc.zombieBosses = 0;
- cf.writeIntConfig("zombie", "timeRNG", lc.zombieTime);
- cf.writeIntConfig("zombie", "bossRNG", 0);
- } else {
- if (lc.zombieBosses != -1) {
- lc.zombieBosses++;
- }
- cf.writeIntConfig("wolf", "bossRNG", lc.zombieBosses);
- }
- }
- }
-
- @SubscribeEvent
- public void renderPlayerInfo(final RenderGameOverlayEvent.Post event) {
- if (event.type != RenderGameOverlayEvent.ElementType.EXPERIENCE) return;
- final ToggleCommand tc = new ToggleCommand();
- final boolean isCoordsToggled = tc.getToggle("coords");
-
- if (isCoordsToggled) {
- ScaledResolution scaled = new ScaledResolution(Minecraft.getMinecraft());
- EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-
- double xDir = (player.rotationYaw % 360 + 360) % 360;
- if (xDir > 180) xDir -= 360;
- xDir = (double) Math.round(xDir * 10d) / 10d;
- double yDir = (double) Math.round(player.rotationPitch * 10d) / 10d;
-
- String coordText = (int) player.posX + " / " + (int) player.posY + " / " + (int) player.posZ + " (" + xDir + " / " + yDir + ")";
- int height = scaled.getScaledHeight();
- new TextRenderer(Minecraft.getMinecraft(), coordText, 5, height - 25, Integer.parseInt("FFFFFF", 16));
- }
-
- final DisplayCommand ds = new DisplayCommand();
- final String displayToggle = ds.display;
-
- if (!displayToggle.equals("off")) {
- final LootCommand lc = new LootCommand();
- String dropsText = "";
- String countText = "";
- String timeBetween = "Never";
- String bossesBetween = "Never";
- int timeNow = (int) System.currentTimeMillis() / 1000;
-
- if (displayToggle.equals("wolf")) {
- if (lc.wolfTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = lc.getTimeBetween(lc.wolfTime, timeNow);
- }
- if (lc.wolfBosses == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = Integer.toString(lc.wolfBosses);
- }
-
- dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
- EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
- EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
- EnumChatFormatting.AQUA + "Spirit Runes:\n" +
- EnumChatFormatting.WHITE + "Critical VI Books:\n" +
- EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
- EnumChatFormatting.GOLD + "Couture Runes:\n" +
- EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
- EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
- countText = EnumChatFormatting.GOLD + "" + lc.wolfSvens + "\n" +
- EnumChatFormatting.GREEN + lc.wolfTeeth + "\n" +
- EnumChatFormatting.BLUE + lc.wolfWheels + "\n" +
- EnumChatFormatting.AQUA + lc.wolfSpirits + "\n" +
- EnumChatFormatting.WHITE + lc.wolfBooks + "\n" +
- EnumChatFormatting.DARK_RED + lc.wolfEggs + "\n" +
- EnumChatFormatting.GOLD + lc.wolfCoutures + "\n" +
- EnumChatFormatting.AQUA + lc.wolfBaits + "\n" +
- EnumChatFormatting.DARK_PURPLE + lc.wolfFluxes + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween + "\n";
- } else if (displayToggle.equals("spider")) {
- if (lc.spiderTime == -1) {
- timeBetween = "Never";
- } else {
- timeBetween = lc.getTimeBetween(lc.spiderTime, timeNow);
- }
- if (lc.spiderBosses == -1) {
- bossesBetween = "Never";
- } else {
- bossesBetween = Integer.toString(lc.spiderBosses);
- }
-
- dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
- EnumChatFormatting.GREEN + "Tarantula Webs:\n" +
- EnumChatFormatting.DARK_GREEN + "Arrow Poison:\n" +
- EnumChatFormatting.DARK_GRAY + "Bite Runes:\n" +
- EnumChatFormatting.WHITE + "Bane VI Books:\n" +
- EnumChatFormatting.AQUA + "Spider Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Tarantula Talismans:\n" +
- EnumChatFormatting.LIGHT_PURPLE + "Fly Swatters:\n" +
- EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
- countText = EnumChatFormatting.GOLD + "" + lc.spiderTarantulas + "\n" +
- EnumChatFormatting.GREEN + lc.spiderWebs + "\n" +
- EnumChatFormatting.DARK_GREEN + lc.spiderTAP + "\n" +
- EnumChatFormatting.DARK_GRAY + lc.spiderBites + "\n" +
- EnumChatFormatting.WHITE + lc.spiderBooks + "\n" +
- EnumChatFormatting.AQUA + lc.spiderCatalysts + "\n" +
- EnumChatFormatting.DARK_PURPLE + lc.spiderTalismans + "\n" +
- EnumChatFormatting.LIGHT_PURPLE + lc.spiderSwatters + "\n" +
- EnumChatFormatting.GOLD + lc.spiderMosquitos + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween + "\n";
- } else {
- // Zombie
- dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
- EnumChatFormatting.GREEN + "Revenant Flesh:\n" +
- EnumChatFormatting.BLUE + "Foul Flesh:\n" +
- EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
- EnumChatFormatting.WHITE + "Smite VI Books:\n" +
- EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
- EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
- EnumChatFormatting.RED + "Revenant Catalysts:\n" +
- EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
- EnumChatFormatting.GOLD + "Scythe Blades:\n" +
- EnumChatFormatting.AQUA + "Time Since RNG:\n" +
- EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
- countText = EnumChatFormatting.GOLD + "" + lc.zombieRevs + "\n" +
- EnumChatFormatting.GREEN + lc.zombieRevFlesh + "\n" +
- EnumChatFormatting.BLUE + lc.zombieFoulFlesh + "\n" +
- EnumChatFormatting.DARK_GREEN + lc.zombiePestilences + "\n" +
- EnumChatFormatting.WHITE + lc.zombieBooks + "\n" +
- EnumChatFormatting.AQUA + lc.zombieUndeadCatas + "\n" +
- EnumChatFormatting.DARK_PURPLE + lc.zombieBeheadeds + "\n" +
- EnumChatFormatting.RED + lc.zombieRevCatas + "\n" +
- EnumChatFormatting.DARK_GREEN + lc.zombieSnakes + "\n" +
- EnumChatFormatting.GOLD + lc.zombieScythes + "\n" +
- EnumChatFormatting.AQUA + timeBetween + "\n" +
- EnumChatFormatting.AQUA + bossesBetween + "\n";
- }
- new TextRenderer(Minecraft.getMinecraft(), dropsText, 80, 5, Integer.parseInt("FFFFFF", 16));
- new TextRenderer(Minecraft.getMinecraft(), countText, 190, 5, Integer.parseInt("FFFFFF", 16));
- }
- }
-
- @SubscribeEvent
- public void onSound(final PlaySoundEvent event) {
- if (event.name.equals("note.pling")) {
- // Don't check twice within 5 seconds
- checkItemsNow = (int) System.currentTimeMillis() / 1000;
- if (checkItemsNow - itemsChecked <= 5) return;
-
- final ScoreboardHandler sc = new ScoreboardHandler();
- List<String> scoreboard = sc.getSidebarLines();
-
- for (String line : scoreboard) {
- String cleanedLine = sc.cleanSB(line);
- if (cleanedLine.contains("Boss slain!")) {
- final LootCommand lc = new LootCommand();
- final ConfigHandler cf = new ConfigHandler();
-
- itemsChecked = (int) System.currentTimeMillis() / 1000;
-
- lc.wolfTeeth += getItems("Wolf Teeth");
- lc.wolfWheels += getItems("Hamster Wheel");
- lc.spiderWebs += getItems("Tarantula Web");
- lc.spiderTAP += getItems("Toxic Arrow Poison");
- lc.zombieRevFlesh += getItems("Revenant Flesh");
- lc.zombieFoulFlesh += getItems("Foul Flesh");
-
- cf.writeIntConfig("wolf", "teeth", lc.wolfTeeth);
- cf.writeIntConfig("wolf", "wheel", lc.wolfWheels);
- cf.writeIntConfig("spider", "web", lc.spiderWebs);
- cf.writeIntConfig("spider", "tap", lc.spiderTAP);
- cf.writeIntConfig("zombie", "revFlesh", lc.zombieRevFlesh);
- cf.writeIntConfig("zombie", "foulFlesh", lc.zombieFoulFlesh);
- }
- }
- }
- }
-
- public int getItems(String item) {
- Minecraft mc = Minecraft.getMinecraft();
- EntityPlayer player = mc.thePlayer;
-
- double x = player.posX;
- double y = player.posY;
- double z = player.posZ;
- AxisAlignedBB scan = new AxisAlignedBB(x - 6, y - 6, z - 6, x + 6, y + 6, z + 6);
- List<EntityItem> items = mc.theWorld.getEntitiesWithinAABB(EntityItem.class, scan);
-
- for (EntityItem i : items) {
- String itemName = StringUtils.stripControlCodes(i.getEntityItem().getDisplayName());
- if (itemName.equals(item)) return i.getEntityItem().stackSize;
- }
- // No items found
- return 0;
- }
-
-}
diff --git a/me/Danker/TheMod.java b/me/Danker/TheMod.java
index 8850bff..3e9791b 100644
--- a/me/Danker/TheMod.java
+++ b/me/Danker/TheMod.java
@@ -6,14 +6,28 @@ import java.awt.Toolkit;
import java.awt.TrayIcon;
import java.util.List;
+import me.Danker.commands.DisplayCommand;
+import me.Danker.commands.GetkeyCommand;
+import me.Danker.commands.LootCommand;
+import me.Danker.commands.ReloadConfigCommand;
+import me.Danker.commands.SetkeyCommand;
+import me.Danker.commands.ToggleCommand;
+import me.Danker.handlers.ConfigHandler;
+import me.Danker.handlers.ScoreboardHandler;
+import me.Danker.handlers.TextRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StringUtils;
import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.event.sound.PlaySoundEvent;
import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -21,11 +35,14 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-@Mod(modid = TheMod.MODID, version = TheMod.VERSION)
+@Mod(modid = TheMod.MODID, version = TheMod.VERSION, clientSideOnly = true)
public class TheMod
{
public static final String MODID = "Danker's Skyblock Mod";
- public static final String VERSION = "1.3";
+ public static final String VERSION = "1.4";
+
+ static int checkItemsNow = 0;
+ static int itemsChecked = 0;
@EventHandler
public void init(FMLInitializationEvent event)
@@ -33,81 +50,8 @@ public class TheMod
FMLCommonHandler.instance().bus().register(this);
MinecraftForge.EVENT_BUS.register(this);
- // Config init
final ConfigHandler cf = new ConfigHandler();
- if (!cf.hasKey("toggles", "GParty")) cf.writeBooleanConfig("toggles", "GParty", true);
- if (!cf.hasKey("toggles", "Coords")) cf.writeBooleanConfig("toggles", "Coords", true);
- if (!cf.hasKey("api", "APIKey")) cf.writeStringConfig("api", "APIKey", "");
-
- // Wolf Loot
- if (!cf.hasKey("wolf", "svens")) cf.writeIntConfig("wolf", "svens", 0);
- if (!cf.hasKey("wolf", "spirit")) cf.writeIntConfig("wolf", "spirit", 0);
- if (!cf.hasKey("wolf", "book")) cf.writeIntConfig("wolf", "book", 0);
- if (!cf.hasKey("wolf", "egg")) cf.writeIntConfig("wolf", "egg", 0);
- if (!cf.hasKey("wolf", "couture")) cf.writeIntConfig("wolf", "couture", 0);
- if (!cf.hasKey("wolf", "bait")) cf.writeIntConfig("wolf", "bait", 0);
- if (!cf.hasKey("wolf", "flux")) cf.writeIntConfig("wolf", "flux", 0);
- if (!cf.hasKey("wolf", "timeRNG")) cf.writeIntConfig("wolf", "timeRNG", -1);
- if (!cf.hasKey("wolf", "bossRNG")) cf.writeIntConfig("wolf", "bossRNG", -1);
- // Spider Loot
- if (!cf.hasKey("spider", "tarantulas")) cf.writeIntConfig("spider", "tarantulas", 0);
- if (!cf.hasKey("spider", "bite")) cf.writeIntConfig("spider", "bite", 0);
- if (!cf.hasKey("spider", "catalyst")) cf.writeIntConfig("spider", "catalyst", 0);
- if (!cf.hasKey("spider", "book")) cf.writeIntConfig("spider", "book", 0);
- if (!cf.hasKey("spider", "swatter")) cf.writeIntConfig("spider", "swatter", 0);
- if (!cf.hasKey("spider", "talisman")) cf.writeIntConfig("spider", "talisman", 0);
- if (!cf.hasKey("spider", "mosquito")) cf.writeIntConfig("spider", "mosquito", 0);
- if (!cf.hasKey("spider", "timeRNG")) cf.writeIntConfig("spider", "timeRNG", -1);
- if (!cf.hasKey("spider", "bossRNG")) cf.writeIntConfig("spider", "bossRNG", -1);
- // Zombie Loot
- if (!cf.hasKey("zombie", "revs")) cf.writeIntConfig("zombie", "revs", 0);
- if (!cf.hasKey("zombie", "pestilence")) cf.writeIntConfig("zombie", "pestilence", 0);
- if (!cf.hasKey("zombie", "undeadCatalyst")) cf.writeIntConfig("zombie", "undeadCatalyst", 0);
- if (!cf.hasKey("zombie", "book")) cf.writeIntConfig("zombie", "book", 0);
- if (!cf.hasKey("zombie", "beheaded")) cf.writeIntConfig("zombie", "beheaded", 0);
- if (!cf.hasKey("zombie", "revCatalyst")) cf.writeIntConfig("zombie", "revCatalyst", 0);
- if (!cf.hasKey("zombie", "snake")) cf.writeIntConfig("zombie", "snake", 0);
- if (!cf.hasKey("zombie", "scythe")) cf.writeIntConfig("zombie", "scythe", 0);
- if (!cf.hasKey("zombie", "timeRNG")) cf.writeIntConfig("zombie", "timeRNG", -1);
- if (!cf.hasKey("zombie", "bossRNG")) cf.writeIntConfig("zombie", "bossRNG", -1);
-
- final ToggleCommand tf = new ToggleCommand();
- tf.gpartyToggled = cf.getBoolean("toggles", "GParty");
- tf.coordsToggled = cf.getBoolean("toggles", "Coords");
-
- final LootCommand lc = new LootCommand();
- // Wolf
- lc.wolfSvens = cf.getInt("wolf", "svens");
- lc.wolfSpirits = cf.getInt("wolf", "spirit");
- lc.wolfBooks = cf.getInt("wolf", "book");
- lc.wolfEggs = cf.getInt("wolf", "egg");
- lc.wolfCoutures = cf.getInt("wolf", "couture");
- lc.wolfBaits = cf.getInt("wolf", "bait");
- lc.wolfFluxes = cf.getInt("wolf", "flux");
- lc.wolfTime = cf.getInt("wolf", "timeRNG");
- lc.wolfBosses = cf.getInt("wolf", "bossRNG");
- // Spider
- lc.spiderTarantulas = cf.getInt("spider", "tarantulas");
- lc.spiderBites = cf.getInt("spider", "bite");
- lc.spiderCatalysts = cf.getInt("spider", "catalyst");
- lc.spiderBooks = cf.getInt("spider", "book");
- lc.spiderSwatters = cf.getInt("spider", "swatter");
- lc.spiderTalismans = cf.getInt("spider", "talisman");
- lc.spiderMosquitos = cf.getInt("spider", "mosquito");
- lc.spiderTime = cf.getInt("spider", "timeRNG");
- lc.spiderBosses = cf.getInt("spider", "bossRNG");
- // Zombie
- lc.zombieRevs = cf.getInt("zombie", "revs");
- lc.zombiePestilences = cf.getInt("zombie", "pestilence");
- lc.zombieUndeadCatas = cf.getInt("zombie", "undeadCatalyst");
- lc.zombieBooks = cf.getInt("zombie", "book");
- lc.zombieBeheadeds = cf.getInt("zombie", "beheaded");
- lc.zombieRevCatas = cf.getInt("zombie", "revCatalyst");
- lc.zombieSnakes = cf.getInt("zombie", "snake");
- lc.zombieScythes = cf.getInt("zombie", "scythe");
- lc.zombieTime = cf.getInt("zombie", "timeRNG");
- lc.zombieBosses = cf.getInt("zombie", "bossRNG");
-
+ cf.reloadConfig();
}
@EventHandler
@@ -116,6 +60,8 @@ public class TheMod
ClientCommandHandler.instance.registerCommand(new SetkeyCommand());
ClientCommandHandler.instance.registerCommand(new GetkeyCommand());
ClientCommandHandler.instance.registerCommand(new LootCommand());
+ ClientCommandHandler.instance.registerCommand(new ReloadConfigCommand());
+ ClientCommandHandler.instance.registerCommand(new DisplayCommand());
}
@SubscribeEvent
@@ -143,8 +89,6 @@ public class TheMod
}
}
- // Time is stored as a 32-bit int in seconds, so if Skyblock
- // survives until 2038, I'll just update it then
final LootCommand lc = new LootCommand();
final ConfigHandler cf = new ConfigHandler();
boolean wolfRNG = false;
@@ -270,6 +214,8 @@ public class TheMod
cf.writeIntConfig("zombie", "scythe", lc.zombieScythes);
}
+ // Time is stored in seconds, so if Skyblock
+ // survives until 2038, I'll just update it then
if (wolfRNG) {
lc.wolfTime = (int) System.currentTimeMillis() / 1000;
lc.wolfBosses = 0;
@@ -325,6 +271,170 @@ public class TheMod
int height = scaled.getScaledHeight();
new TextRenderer(Minecraft.getMinecraft(), coordText, 5, height - 25, Integer.parseInt("FFFFFF", 16));
}
+
+ final DisplayCommand ds = new DisplayCommand();
+ final String displayToggle = ds.display;
+
+ if (!displayToggle.equals("off")) {
+ final LootCommand lc = new LootCommand();
+ String dropsText = "";
+ String countText = "";
+ String timeBetween = "Never";
+ String bossesBetween = "Never";
+ int timeNow = (int) System.currentTimeMillis() / 1000;
+
+ if (displayToggle.equals("wolf")) {
+ if (lc.wolfTime == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = lc.getTimeBetween(lc.wolfTime, timeNow);
+ }
+ if (lc.wolfBosses == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = Integer.toString(lc.wolfBosses);
+ }
+
+ dropsText = EnumChatFormatting.GOLD + "Svens Killed:\n" +
+ EnumChatFormatting.GREEN + "Wolf Teeth:\n" +
+ EnumChatFormatting.BLUE + "Hamster Wheels:\n" +
+ EnumChatFormatting.AQUA + "Spirit Runes:\n" +
+ EnumChatFormatting.WHITE + "Critical VI Books:\n" +
+ EnumChatFormatting.DARK_RED + "Red Claw Eggs:\n" +
+ EnumChatFormatting.GOLD + "Couture Runes:\n" +
+ EnumChatFormatting.AQUA + "Grizzly Baits:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Overfluxes:\n" +
+ EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+ EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+ countText = EnumChatFormatting.GOLD + "" + lc.wolfSvens + "\n" +
+ EnumChatFormatting.GREEN + lc.wolfTeeth + "\n" +
+ EnumChatFormatting.BLUE + lc.wolfWheels + "\n" +
+ EnumChatFormatting.AQUA + lc.wolfSpirits + "\n" +
+ EnumChatFormatting.WHITE + lc.wolfBooks + "\n" +
+ EnumChatFormatting.DARK_RED + lc.wolfEggs + "\n" +
+ EnumChatFormatting.GOLD + lc.wolfCoutures + "\n" +
+ EnumChatFormatting.AQUA + lc.wolfBaits + "\n" +
+ EnumChatFormatting.DARK_PURPLE + lc.wolfFluxes + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween + "\n";
+ } else if (displayToggle.equals("spider")) {
+ if (lc.spiderTime == -1) {
+ timeBetween = "Never";
+ } else {
+ timeBetween = lc.getTimeBetween(lc.spiderTime, timeNow);
+ }
+ if (lc.spiderBosses == -1) {
+ bossesBetween = "Never";
+ } else {
+ bossesBetween = Integer.toString(lc.spiderBosses);
+ }
+
+ dropsText = EnumChatFormatting.GOLD + "Tarantulas Killed:\n" +
+ EnumChatFormatting.GREEN + "Tarantula Webs:\n" +
+ EnumChatFormatting.DARK_GREEN + "Arrow Poison:\n" +
+ EnumChatFormatting.DARK_GRAY + "Bite Runes:\n" +
+ EnumChatFormatting.WHITE + "Bane VI Books:\n" +
+ EnumChatFormatting.AQUA + "Spider Catalysts:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Tarantula Talismans:\n" +
+ EnumChatFormatting.LIGHT_PURPLE + "Fly Swatters:\n" +
+ EnumChatFormatting.GOLD + "Digested Mosquitos:\n" +
+ EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+ EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+ countText = EnumChatFormatting.GOLD + "" + lc.spiderTarantulas + "\n" +
+ EnumChatFormatting.GREEN + lc.spiderWebs + "\n" +
+ EnumChatFormatting.DARK_GREEN + lc.spiderTAP + "\n" +
+ EnumChatFormatting.DARK_GRAY + lc.spiderBites + "\n" +
+ EnumChatFormatting.WHITE + lc.spiderBooks + "\n" +
+ EnumChatFormatting.AQUA + lc.spiderCatalysts + "\n" +
+ EnumChatFormatting.DARK_PURPLE + lc.spiderTalismans + "\n" +
+ EnumChatFormatting.LIGHT_PURPLE + lc.spiderSwatters + "\n" +
+ EnumChatFormatting.GOLD + lc.spiderMosquitos + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween + "\n";
+ } else {
+ // Zombie
+ dropsText = EnumChatFormatting.GOLD + "Revs Killed:\n" +
+ EnumChatFormatting.GREEN + "Revenant Flesh:\n" +
+ EnumChatFormatting.BLUE + "Foul Flesh:\n" +
+ EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
+ EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+ EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
+ EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
+ EnumChatFormatting.RED + "Revenant Catalysts:\n" +
+ EnumChatFormatting.DARK_GREEN + "Snake Runes:\n" +
+ EnumChatFormatting.GOLD + "Scythe Blades:\n" +
+ EnumChatFormatting.AQUA + "Time Since RNG:\n" +
+ EnumChatFormatting.AQUA + "Bosses Since RNG:\n";
+ countText = EnumChatFormatting.GOLD + "" + lc.zombieRevs + "\n" +
+ EnumChatFormatting.GREEN + lc.zombieRevFlesh + "\n" +
+ EnumChatFormatting.BLUE + lc.zombieFoulFlesh + "\n" +
+ EnumChatFormatting.DARK_GREEN + lc.zombiePestilences + "\n" +
+ EnumChatFormatting.WHITE + lc.zombieBooks + "\n" +
+ EnumChatFormatting.AQUA + lc.zombieUndeadCatas + "\n" +
+ EnumChatFormatting.DARK_PURPLE + lc.zombieBeheadeds + "\n" +
+ EnumChatFormatting.RED + lc.zombieRevCatas + "\n" +
+ EnumChatFormatting.DARK_GREEN + lc.zombieSnakes + "\n" +
+ EnumChatFormatting.GOLD + lc.zombieScythes + "\n" +
+ EnumChatFormatting.AQUA + timeBetween + "\n" +
+ EnumChatFormatting.AQUA + bossesBetween + "\n";
+ }
+ new TextRenderer(Minecraft.getMinecraft(), dropsText, 80, 5, Integer.parseInt("FFFFFF", 16));
+ new TextRenderer(Minecraft.getMinecraft(), countText, 190, 5, Integer.parseInt("FFFFFF", 16));
+ }
+ }
+
+ @SubscribeEvent
+ public void onSound(final PlaySoundEvent event) {
+ if (event.name.equals("note.pling")) {
+ // Don't check twice within 5 seconds
+ checkItemsNow = (int) System.currentTimeMillis() / 1000;
+ if (checkItemsNow - itemsChecked <= 5) return;
+
+ final ScoreboardHandler sc = new ScoreboardHandler();
+ List<String> scoreboard = sc.getSidebarLines();
+
+ for (String line : scoreboard) {
+ String cleanedLine = sc.cleanSB(line);
+ if (cleanedLine.contains("Boss slain!")) {
+ final LootCommand lc = new LootCommand();
+ final ConfigHandler cf = new ConfigHandler();
+
+ itemsChecked = (int) System.currentTimeMillis() / 1000;
+
+ lc.wolfTeeth += getItems("Wolf Teeth");
+ lc.wolfWheels += getItems("Hamster Wheel");
+ lc.spiderWebs += getItems("Tarantula Web");
+ lc.spiderTAP += getItems("Toxic Arrow Poison");
+ lc.zombieRevFlesh += getItems("Revenant Flesh");
+ lc.zombieFoulFlesh += getItems("Foul Flesh");
+
+ cf.writeIntConfig("wolf", "teeth", lc.wolfTeeth);
+ cf.writeIntConfig("wolf", "wheel", lc.wolfWheels);
+ cf.writeIntConfig("spider", "web", lc.spiderWebs);
+ cf.writeIntConfig("spider", "tap", lc.spiderTAP);
+ cf.writeIntConfig("zombie", "revFlesh", lc.zombieRevFlesh);
+ cf.writeIntConfig("zombie", "foulFlesh", lc.zombieFoulFlesh);
+ }
+ }
+ }
+ }
+
+ public int getItems(String item) {
+ Minecraft mc = Minecraft.getMinecraft();
+ EntityPlayer player = mc.thePlayer;
+
+ double x = player.posX;
+ double y = player.posY;
+ double z = player.posZ;
+ AxisAlignedBB scan = new AxisAlignedBB(x - 6, y - 6, z - 6, x + 6, y + 6, z + 6);
+ List<EntityItem> items = mc.theWorld.getEntitiesWithinAABB(EntityItem.class, scan);
+
+ for (EntityItem i : items) {
+ String itemName = StringUtils.stripControlCodes(i.getEntityItem().getDisplayName());
+ if (itemName.equals(item)) return i.getEntityItem().stackSize;
+ }
+ // No items found
+ return 0;
}
}
diff --git a/Danker/commands/DisplayCommand.java b/me/Danker/commands/DisplayCommand.java
index 534ce16..534ce16 100644
--- a/Danker/commands/DisplayCommand.java
+++ b/me/Danker/commands/DisplayCommand.java
diff --git a/Danker/commands/GetkeyCommand.java b/me/Danker/commands/GetkeyCommand.java
index e8b29e6..e8b29e6 100644
--- a/Danker/commands/GetkeyCommand.java
+++ b/me/Danker/commands/GetkeyCommand.java
diff --git a/Danker/commands/LootCommand.java b/me/Danker/commands/LootCommand.java
index 4b05d25..4b05d25 100644
--- a/Danker/commands/LootCommand.java
+++ b/me/Danker/commands/LootCommand.java
diff --git a/Danker/commands/ReloadConfigCommand.java b/me/Danker/commands/ReloadConfigCommand.java
index 4eda66b..4eda66b 100644
--- a/Danker/commands/ReloadConfigCommand.java
+++ b/me/Danker/commands/ReloadConfigCommand.java
diff --git a/Danker/commands/SetkeyCommand.java b/me/Danker/commands/SetkeyCommand.java
index 85e9dd7..85e9dd7 100644
--- a/Danker/commands/SetkeyCommand.java
+++ b/me/Danker/commands/SetkeyCommand.java
diff --git a/Danker/commands/ToggleCommand.java b/me/Danker/commands/ToggleCommand.java
index 7e1b83a..7e1b83a 100644
--- a/Danker/commands/ToggleCommand.java
+++ b/me/Danker/commands/ToggleCommand.java
diff --git a/Danker/handlers/ConfigHandler.java b/me/Danker/handlers/ConfigHandler.java
index c9556f1..c9556f1 100644
--- a/Danker/handlers/ConfigHandler.java
+++ b/me/Danker/handlers/ConfigHandler.java
diff --git a/Danker/handlers/ScoreboardHandler.java b/me/Danker/handlers/ScoreboardHandler.java
index e89591b..e89591b 100644
--- a/Danker/handlers/ScoreboardHandler.java
+++ b/me/Danker/handlers/ScoreboardHandler.java
diff --git a/Danker/handlers/TextRenderer.java b/me/Danker/handlers/TextRenderer.java
index 262f932..262f932 100644
--- a/Danker/handlers/TextRenderer.java
+++ b/me/Danker/handlers/TextRenderer.java
generated by cgit (git 2.46.0) at 2024-11-21 22:03:33 +0000