aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/Danker/commands/LootCommand.java2
-rw-r--r--src/main/java/me/Danker/commands/ResetLootCommand.java1
-rw-r--r--src/main/java/me/Danker/features/PetColours.java1
-rw-r--r--src/main/java/me/Danker/features/SpiritBootsFix.java2
-rw-r--r--src/main/java/me/Danker/features/loot/LootDisplay.java4
-rw-r--r--src/main/java/me/Danker/features/loot/SpiderTracker.java12
-rw-r--r--src/main/java/me/Danker/features/loot/WolfTracker.java12
-rw-r--r--src/main/java/me/Danker/features/loot/ZombieTracker.java18
-rw-r--r--src/main/java/me/Danker/features/puzzlesolvers/ChronomatronSolver.java1
-rw-r--r--src/main/java/me/Danker/features/puzzlesolvers/UltrasequencerSolver.java1
10 files changed, 26 insertions, 28 deletions
diff --git a/src/main/java/me/Danker/commands/LootCommand.java b/src/main/java/me/Danker/commands/LootCommand.java
index 40b215d..e91c656 100644
--- a/src/main/java/me/Danker/commands/LootCommand.java
+++ b/src/main/java/me/Danker/commands/LootCommand.java
@@ -227,6 +227,7 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.BLUE + " Foul Flesh: " + drop20 + "\n" +
EnumChatFormatting.DARK_GREEN + " Pestilence Runes: " +ZombieTracker.zombiePestilencesSession + "\n" +
EnumChatFormatting.WHITE + " Smite VI Books: " + ZombieTracker.zombieBooksSession + "\n" +
+ EnumChatFormatting.WHITE + " Smite VII Books: " + ZombieTracker.zombieBooksT7Session + "\n" +
EnumChatFormatting.AQUA + " Undead Catalysts: " + ZombieTracker.zombieUndeadCatasSession + "\n" +
EnumChatFormatting.DARK_PURPLE + " Beheaded Horrors: " + ZombieTracker.zombieBeheadedsSession + "\n" +
EnumChatFormatting.RED + " Revenant Catalysts: " + ZombieTracker.zombieRevCatasSession + "\n" +
@@ -264,6 +265,7 @@ public class LootCommand extends CommandBase {
EnumChatFormatting.BLUE + " Foul Flesh: " + drop20 + "\n" +
EnumChatFormatting.DARK_GREEN + " Pestilence Runes: " + ZombieTracker.zombiePestilences + "\n" +
EnumChatFormatting.WHITE + " Smite VI Books: " + ZombieTracker.zombieBooks + "\n" +
+ EnumChatFormatting.WHITE + " Smite VII Books: " + ZombieTracker.zombieBooksT7 + "\n" +
EnumChatFormatting.AQUA + " Undead Catalysts: " + ZombieTracker.zombieUndeadCatas + "\n" +
EnumChatFormatting.DARK_PURPLE + " Beheaded Horrors: " + ZombieTracker.zombieBeheadeds + "\n" +
EnumChatFormatting.RED + " Revenant Catalysts: " + ZombieTracker.zombieRevCatas + "\n" +
diff --git a/src/main/java/me/Danker/commands/ResetLootCommand.java b/src/main/java/me/Danker/commands/ResetLootCommand.java
index 974d50c..f64ceb1 100644
--- a/src/main/java/me/Danker/commands/ResetLootCommand.java
+++ b/src/main/java/me/Danker/commands/ResetLootCommand.java
@@ -130,6 +130,7 @@ public class ResetLootCommand extends CommandBase {
ZombieTracker.zombiePestilencesSession = 0;
ZombieTracker.zombieUndeadCatasSession = 0;
ZombieTracker.zombieBooksSession = 0;
+ ZombieTracker.zombieBooksT7Session = 0;
ZombieTracker.zombieBeheadedsSession = 0;
ZombieTracker.zombieRevCatasSession = 0;
ZombieTracker.zombieSnakesSession = 0;
diff --git a/src/main/java/me/Danker/features/PetColours.java b/src/main/java/me/Danker/features/PetColours.java
index 940bb08..0e219db 100644
--- a/src/main/java/me/Danker/features/PetColours.java
+++ b/src/main/java/me/Danker/features/PetColours.java
@@ -3,7 +3,6 @@ package me.Danker.features;
import me.Danker.commands.ToggleCommand;
import me.Danker.events.GuiChestBackgroundDrawnEvent;
import me.Danker.utils.RenderUtils;
-import me.Danker.utils.Utils;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StringUtils;
diff --git a/src/main/java/me/Danker/features/SpiritBootsFix.java b/src/main/java/me/Danker/features/SpiritBootsFix.java
index c50b538..8719fcf 100644
--- a/src/main/java/me/Danker/features/SpiritBootsFix.java
+++ b/src/main/java/me/Danker/features/SpiritBootsFix.java
@@ -11,7 +11,7 @@ import java.lang.reflect.Field;
public class SpiritBootsFix {
- static Field slot = ReflectionHelper.findField(S04PacketEntityEquipment.class, "equipmentSlot", "field_149392_b");
+ static Field slot = ReflectionHelper.findField(S04PacketEntityEquipment.class, "equipmentSlot", "field_149392_b", "b");
@SubscribeEvent
public void onPacketRead(PacketReadEvent event) throws IllegalAccessException {
diff --git a/src/main/java/me/Danker/features/loot/LootDisplay.java b/src/main/java/me/Danker/features/loot/LootDisplay.java
index 9f7f0e3..b1c584d 100644
--- a/src/main/java/me/Danker/features/loot/LootDisplay.java
+++ b/src/main/java/me/Danker/features/loot/LootDisplay.java
@@ -217,6 +217,7 @@ public class LootDisplay {
EnumChatFormatting.BLUE + "Foul Flesh:\n" +
EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+ EnumChatFormatting.WHITE + "Smite VII Books:\n" +
EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
@@ -232,6 +233,7 @@ public class LootDisplay {
EnumChatFormatting.BLUE + drop20 + "\n" +
EnumChatFormatting.DARK_GREEN + ZombieTracker.zombiePestilences + "\n" +
EnumChatFormatting.WHITE + ZombieTracker.zombieBooks + "\n" +
+ EnumChatFormatting.WHITE + ZombieTracker.zombieBooksT7 + "\n" +
EnumChatFormatting.AQUA + ZombieTracker.zombieUndeadCatas + "\n" +
EnumChatFormatting.DARK_PURPLE + ZombieTracker.zombieBeheadeds + "\n" +
EnumChatFormatting.RED + ZombieTracker.zombieRevCatas + "\n" +
@@ -265,6 +267,7 @@ public class LootDisplay {
EnumChatFormatting.BLUE + "Foul Flesh:\n" +
EnumChatFormatting.DARK_GREEN + "Pestilence Runes:\n" +
EnumChatFormatting.WHITE + "Smite VI Books:\n" +
+ EnumChatFormatting.WHITE + "Smite VII Books:\n" +
EnumChatFormatting.AQUA + "Undead Catalysts:\n" +
EnumChatFormatting.DARK_PURPLE + "Beheaded Horrors:\n" +
EnumChatFormatting.RED + "Revenant Catalysts:\n" +
@@ -280,6 +283,7 @@ public class LootDisplay {
EnumChatFormatting.BLUE + drop20 + "\n" +
EnumChatFormatting.DARK_GREEN + ZombieTracker.zombiePestilencesSession + "\n" +
EnumChatFormatting.WHITE + ZombieTracker.zombieBooksSession + "\n" +
+ EnumChatFormatting.WHITE + ZombieTracker.zombieBooksT7Session + "\n" +
EnumChatFormatting.AQUA + ZombieTracker.zombieUndeadCatasSession + "\n" +
EnumChatFormatting.DARK_PURPLE + ZombieTracker.zombieBeheadedsSession + "\n" +
EnumChatFormatting.RED + ZombieTracker.zombieRevCatasSession + "\n" +
diff --git a/src/main/java/me/Danker/features/loot/SpiderTracker.java b/src/main/java/me/Danker/features/loot/SpiderTracker.java
index e6227b2..34ee695 100644
--- a/src/main/java/me/Danker/features/loot/SpiderTracker.java
+++ b/src/main/java/me/Danker/features/loot/SpiderTracker.java
@@ -46,14 +46,6 @@ public class SpiderTracker {
boolean rng = false;
- if (message.contains("VERY RARE DROP! (Enchanted Book)") || message.contains("CRAZY RARE DROP! (Enchanted Book)")) {
- if (Utils.isInScoreboard("Tarantula Broodfather")) {
- spiderBooks++;
- spiderBooksSession++;
- ConfigHandler.writeIntConfig("spider", "book", spiderBooks);
- }
- }
-
if (message.contains(" Spider Slayer LVL ")) { // Spider
spiderTarantulas++;
spiderTarantulasSession++;
@@ -77,6 +69,10 @@ public class SpiderTracker {
spiderBites++;
spiderBitesSession++;
ConfigHandler.writeIntConfig("spider", "bite", spiderBites);
+ } else if (message.contains("VERY RARE DROP! (Bane of Arthropods VI)")) {
+ spiderBooks++;
+ spiderBooksSession++;
+ ConfigHandler.writeIntConfig("spider", "book", spiderBooks);
} else if (message.contains("VERY RARE DROP! (Spider Catalyst)")) {
spiderCatalysts++;
spiderCatalystsSession++;
diff --git a/src/main/java/me/Danker/features/loot/WolfTracker.java b/src/main/java/me/Danker/features/loot/WolfTracker.java
index f248914..449a3b4 100644
--- a/src/main/java/me/Danker/features/loot/WolfTracker.java
+++ b/src/main/java/me/Danker/features/loot/WolfTracker.java
@@ -46,14 +46,6 @@ public class WolfTracker {
boolean rng = false;
- if (message.contains("VERY RARE DROP! (Enchanted Book)") || message.contains("CRAZY RARE DROP! (Enchanted Book)")) {
- if (Utils.isInScoreboard("Sven Packmaster")) {
- wolfBooks++;
- wolfBooksSession++;
- ConfigHandler.writeIntConfig("wolf", "book", wolfBooks);
- }
- }
-
if (message.contains(" Wolf Slayer LVL ")) {
wolfSvens++;
wolfSvensSession++;
@@ -77,6 +69,10 @@ public class WolfTracker {
wolfSpirits++;
wolfSpiritsSession++;
ConfigHandler.writeIntConfig("wolf", "spirit", wolfSpirits);
+ } else if (message.contains("VERY RARE DROP! (Critical VI)")) {
+ wolfBooks++;
+ wolfBooksSession++;
+ ConfigHandler.writeIntConfig("wolf", "book", wolfBooks);
} else if (message.contains("CRAZY RARE DROP! (Red Claw Egg)")) {
rng = true;
wolfEggs++;
diff --git a/src/main/java/me/Danker/features/loot/ZombieTracker.java b/src/main/java/me/Danker/features/loot/ZombieTracker.java
index 5914599..1d71222 100644
--- a/src/main/java/me/Danker/features/loot/ZombieTracker.java
+++ b/src/main/java/me/Danker/features/loot/ZombieTracker.java
@@ -18,6 +18,7 @@ public class ZombieTracker {
public static int zombiePestilences;
public static int zombieUndeadCatas;
public static int zombieBooks;
+ public static int zombieBooksT7;
public static int zombieBeheadeds;
public static int zombieRevCatas;
public static int zombieSnakes;
@@ -35,6 +36,7 @@ public class ZombieTracker {
public static int zombiePestilencesSession = 0;
public static int zombieUndeadCatasSession = 0;
public static int zombieBooksSession = 0;
+ public static int zombieBooksT7Session = 0;
public static int zombieBeheadedsSession = 0;
public static int zombieRevCatasSession = 0;
public static int zombieSnakesSession = 0;
@@ -54,14 +56,6 @@ public class ZombieTracker {
boolean rng = false;
- if (message.contains("VERY RARE DROP! (Enchanted Book)") || message.contains("CRAZY RARE DROP! (Enchanted Book)")) {
- if (Utils.isInScoreboard("Revenant Horror")) {
- zombieBooks++;
- zombieBooksSession++;
- ConfigHandler.writeIntConfig("zombie", "book", zombieBooks);
- }
- }
-
if (message.contains(" Zombie Slayer LVL ")) { // Zombie
zombieRevs++;
zombieRevsSession++;
@@ -94,6 +88,14 @@ public class ZombieTracker {
zombiePestilences++;
zombiePestilencesSession++;
ConfigHandler.writeIntConfig("zombie", "pestilence", zombiePestilences);
+ } else if (message.contains("VERY RARE DROP! (Smite VI)")) {
+ zombieBooks++;
+ zombieBooksSession++;
+ ConfigHandler.writeIntConfig("zombie", "book", zombieBooks);
+ } else if (message.contains("VERY RARE DROP! (Smite VII)")) {
+ zombieBooksT7++;
+ zombieBooksT7Session++;
+ ConfigHandler.writeIntConfig("zombie", "bookT7", zombieBooksT7);
} else if (message.contains("VERY RARE DROP! (Undead Catalyst)")) {
zombieUndeadCatas++;
zombieUndeadCatasSession++;
diff --git a/src/main/java/me/Danker/features/puzzlesolvers/ChronomatronSolver.java b/src/main/java/me/Danker/features/puzzlesolvers/ChronomatronSolver.java
index ed4adca..51ffd0d 100644
--- a/src/main/java/me/Danker/features/puzzlesolvers/ChronomatronSolver.java
+++ b/src/main/java/me/Danker/features/puzzlesolvers/ChronomatronSolver.java
@@ -5,7 +5,6 @@ import me.Danker.events.ChestSlotClickedEvent;
import me.Danker.events.GuiChestBackgroundDrawnEvent;
import me.Danker.handlers.TextRenderer;
import me.Danker.utils.RenderUtils;
-import me.Danker.utils.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.init.Blocks;
diff --git a/src/main/java/me/Danker/features/puzzlesolvers/UltrasequencerSolver.java b/src/main/java/me/Danker/features/puzzlesolvers/UltrasequencerSolver.java
index 6813b7f..a3a97b6 100644
--- a/src/main/java/me/Danker/features/puzzlesolvers/UltrasequencerSolver.java
+++ b/src/main/java/me/Danker/features/puzzlesolvers/UltrasequencerSolver.java
@@ -3,7 +3,6 @@ package me.Danker.features.puzzlesolvers;
import me.Danker.commands.ToggleCommand;
import me.Danker.events.GuiChestBackgroundDrawnEvent;
import me.Danker.utils.RenderUtils;
-import me.Danker.utils.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.inventory.GuiChest;
generated by cgit (git 2.46.0) at 2024-11-26 08:45:24 +0000