Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.3 #171

Merged
merged 26 commits into from
Jul 2, 2024
Merged

2.3 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e224d77
Fix double hook
bowser0000 Jan 6, 2024
50a7fd7
Fix tracking insane drops
bowser0000 Jan 6, 2024
81027cb
Update Zombie Miner message
bowser0000 Jan 9, 2024
da07df8
fix
kaitp1016 Jan 15, 2024
9b10b3e
Merge pull request #160 from kaitp1016/master
bowser0000 Jan 15, 2024
bfd6c46
Fix Minos Champions counting twice
bowser0000 Jan 19, 2024
0870ef4
Update skill positions
bowser0000 Jan 21, 2024
d35d303
Fix NPE in alert patterns
nea89o Feb 24, 2024
ddd7196
Merge pull request #161 from nea89o/fix/alert-regex-npe
bowser0000 Feb 24, 2024
245deff
Improved BlockPlacingFlowers.java
Dingsel Mar 7, 2024
4bac2f7
Removed unused imports in BlockPlacing. Oops
Dingsel Mar 7, 2024
d2a1857
Removed space in BlockPlacingFlowers
Dingsel Mar 7, 2024
4352446
Merge pull request #164 from Dingsel/development
bowser0000 Mar 25, 2024
526156c
Add /gfs Ender Pearl keybind
bowser0000 Mar 25, 2024
9114710
Update README.md
bowser0000 Apr 5, 2024
4f9e0a2
Fix SSL
bowser0000 Apr 7, 2024
3a3ceea
Add glacite to powder tracker
bowser0000 Apr 14, 2024
961dad6
Fix powder not tracking inside mineshaft
bowser0000 Apr 14, 2024
7af55fd
oops
bowser0000 Apr 14, 2024
9a29257
Add glacite powder to /hotmof
bowser0000 Apr 16, 2024
b13ceee
Add new gems to lore
bowser0000 Apr 16, 2024
ceed033
Fix HUD icons being tinted
bowser0000 May 5, 2024
e071c24
Fix Trivia Solver
Jason54jg May 6, 2024
c5db207
Merge pull request #168 from Jason54jg/patch-1
bowser0000 May 16, 2024
7a7ed49
Fix pet colors crash with favourite pets
bowser0000 Jul 2, 2024
7497bd5
Version bump: 2.3
bowser0000 Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ QOL changes that enhances your Hypixel Skyblock experience. Created to add featu

Discord Server: https://discord.gg/QsEkNQS

Modrinth Link: https://modrinth.com/mod/dankers-skyblock-mod

<details>
<summary>Incompatibilites</summary>

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mod_name = Danker's Skyblock Mod
mod_id = Danker's Skyblock Mod
mod_version = 2.2
mod_version = 2.3

essential.defaults.loom=0

Expand Down
46 changes: 23 additions & 23 deletions src/main/java/me/Danker/DankersSkyblockMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,18 +241,18 @@ public void preInit(FMLPreInitializationEvent event) {

@EventHandler
public void postInit(FMLPostInitializationEvent event) {
Package[] packages = Package.getPackages();
for (Package p : packages){
if (p.getName().startsWith("com.spiderfrog.gadgets") || p.getName().startsWith("com.spiderfrog.oldanimations")){
usingOAM = true;
break;
}
}
System.out.println("OAM detection: " + usingOAM);

usingLabymod = Loader.isModLoaded("labymod");
System.out.println("LabyMod detection: " + usingLabymod);
Package[] packages = Package.getPackages();
for (Package p : packages){
if (p.getName().startsWith("com.spiderfrog.gadgets") || p.getName().startsWith("com.spiderfrog.oldanimations")){
usingOAM = true;
break;
}
}
System.out.println("OAM detection: " + usingOAM);

usingLabymod = Loader.isModLoaded("labymod");
System.out.println("LabyMod detection: " + usingLabymod);
if (!ClientCommandHandler.instance.getCommands().containsKey("reparty")) {
ClientCommandHandler.instance.registerCommand(new RepartyCommand());
} else if (CfgConfig.getBoolean("commands", "reparty")) {
Expand All @@ -266,12 +266,12 @@ public void postInit(FMLPostInitializationEvent event) {
}

@SubscribeEvent
public void onGuiOpenEvent(GuiOpenEvent event) {
if (event.gui instanceof GuiMainMenu && usingOAM && !OAMWarning) {
event.gui = new WarningGuiRedirect(new WarningGui());
OAMWarning = true;
}
}
public void onGuiOpenEvent(GuiOpenEvent event) {
if (event.gui instanceof GuiMainMenu && usingOAM && !OAMWarning) {
event.gui = new WarningGuiRedirect(new WarningGui());
OAMWarning = true;
}
}

@SubscribeEvent
public void onJoin(EntityJoinWorldEvent event) {
Expand Down Expand Up @@ -412,11 +412,11 @@ public void onTick(TickEvent.ClientTickEvent event) {
if (chestName.equals("Your Skills")) {
List<Slot> invSlots = ((GuiChest) mc.currentScreen).inventorySlots.inventorySlots;

farmingLevel = Utils.initializeSkill(invSlots.get(19).getStack(), "farming");
miningLevel = Utils.initializeSkill(invSlots.get(20).getStack(), "mining");
combatLevel = Utils.initializeSkill(invSlots.get(21).getStack(), "combat");
foragingLevel = Utils.initializeSkill(invSlots.get(22).getStack(), "foraging");
fishingLevel = Utils.initializeSkill(invSlots.get(23).getStack(), "fishing");
combatLevel = Utils.initializeSkill(invSlots.get(19).getStack(), "combat");
farmingLevel = Utils.initializeSkill(invSlots.get(20).getStack(), "farming");
fishingLevel = Utils.initializeSkill(invSlots.get(21).getStack(), "fishing");
miningLevel = Utils.initializeSkill(invSlots.get(22).getStack(), "mining");
foragingLevel = Utils.initializeSkill(invSlots.get(23).getStack(), "foraging");
enchantingLevel = Utils.initializeSkill(invSlots.get(24).getStack(), "enchanting");
alchemyLevel = Utils.initializeSkill(invSlots.get(25).getStack(), "alchemy");
carpentryLevel = Utils.initializeSkill(invSlots.get(29).getStack(), "carpentry");
Expand Down
104 changes: 52 additions & 52 deletions src/main/java/me/Danker/commands/DHelpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,59 @@

public class DHelpCommand extends CommandBase {

@Override
public String getCommandName() {
return "dhelp";
}
@Override
public String getCommandName() {
return "dhelp";
}

@Override
public String getCommandUsage(ICommandSender arg0) {
return "/" + getCommandName();
}
@Override
public String getCommandUsage(ICommandSender arg0) {
return "/" + getCommandName();
}

@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
EntityPlayer player = (EntityPlayer) arg0;
player.addChatMessage(new ChatComponentText("\n" + EnumChatFormatting.GOLD + " " + DankersSkyblockMod.MODID + " Version " + DankersSkyblockMod.VERSION + "\n" +
EnumChatFormatting.AQUA + " <> = Mandatory parameter. [] = Optional parameter.\n" +
EnumChatFormatting.GOLD + " Commands, " + EnumChatFormatting.GREEN + " Keybinds.\n" +
EnumChatFormatting.GOLD + getCommandUsage(arg0) + EnumChatFormatting.AQUA + " - Returns this message.\n" +
EnumChatFormatting.GOLD + DankerGuiCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Opens the GUI for Danker's Skyblock Mod.\n" +
EnumChatFormatting.GOLD + LootCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
EnumChatFormatting.GOLD + DisplayCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.\n" +
EnumChatFormatting.GOLD + ResetLootCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
EnumChatFormatting.GOLD + SlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + SkillsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + LobbySkillsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average skills of the lobby, as well the three players with the highest skill average.\n" +
EnumChatFormatting.GOLD + GuildOfCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + PetsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + BankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + ArmourCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get armor of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + DungeonsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + WeightCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get weight of a person. If no name is provided, it checks yours. Adding lily uses lily's weight instead of Senither's.\n" +
EnumChatFormatting.GOLD + ImportFishingCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
EnumChatFormatting.GOLD + SkyblockPlayersCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
EnumChatFormatting.GOLD + SkillTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
EnumChatFormatting.GOLD + LobbyBankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average bank total of the lobby, as well the three players with the highest total money in the bank(and purse).\n" +
EnumChatFormatting.GOLD + RepartyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
EnumChatFormatting.GOLD + PlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find skills, slayers, coins and weight of a player.\n" +
EnumChatFormatting.GOLD + ReloadConfigCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod config.\n" +
EnumChatFormatting.GOLD + ReloadRepoCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod repository.\n" +
EnumChatFormatting.GOLD + HOTMCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find total powder and HotM tree of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + TrophyFishCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find trophy fish stats of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + StopLobbyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops currently running /lobbyskills or /lobbybank command.\n" +
EnumChatFormatting.GOLD + PowderTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for powder/hour.\n" +
EnumChatFormatting.GREEN + "Open Maddox Menu" + EnumChatFormatting.AQUA + " - M by default.\n" +
EnumChatFormatting.GREEN + "Regular Ability" + EnumChatFormatting.AQUA + " - Numpad 4 by default.\n" +
EnumChatFormatting.GREEN + "Start/Stop Skill Tracker" + EnumChatFormatting.AQUA + " - Numpad 5 by default.\n" +
EnumChatFormatting.GREEN + "Create Waypoint" + EnumChatFormatting.AQUA + " - Numpad 6 by default.\n" +
EnumChatFormatting.GREEN + "Start/Stop Powder Tracker" + EnumChatFormatting.AQUA + " - Numpad 8 by default.\n"));
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
EntityPlayer player = (EntityPlayer) arg0;
player.addChatMessage(new ChatComponentText("\n" + EnumChatFormatting.GOLD + " " + DankersSkyblockMod.MODID + " Version " + DankersSkyblockMod.VERSION + "\n" +
EnumChatFormatting.AQUA + " <> = Mandatory parameter. [] = Optional parameter.\n" +
EnumChatFormatting.GOLD + " Commands, " + EnumChatFormatting.GREEN + " Keybinds.\n" +
EnumChatFormatting.GOLD + getCommandUsage(arg0) + EnumChatFormatting.AQUA + " - Returns this message.\n" +
EnumChatFormatting.GOLD + DankerGuiCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Opens the GUI for Danker's Skyblock Mod.\n" +
EnumChatFormatting.GOLD + LootCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Returns loot received from slayer quests or fishing stats. /loot fishing winter returns winter sea creatures instead.\n" +
EnumChatFormatting.GOLD + DisplayCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for trackers. /display fishing winter displays winter sea creatures instead. /display auto automatically displays the loot for the slayer quest you have active.\n" +
EnumChatFormatting.GOLD + ResetLootCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Resets loot for trackers. /resetloot confirm confirms the reset.\n" +
EnumChatFormatting.GOLD + SlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get slayer xp of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + SkillsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get skill levels of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + LobbySkillsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average skills of the lobby, as well the three players with the highest skill average.\n" +
EnumChatFormatting.GOLD + GuildOfCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get guild name and guild master of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + PetsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get pets of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + BankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get bank and purse coins of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + ArmourCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get armor of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + DungeonsCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get dungeon levels of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + WeightCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to get weight of a person. If no name is provided, it checks yours. Adding lily uses lily's weight instead of Senither's.\n" +
EnumChatFormatting.GOLD + ImportFishingCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Imports your fishing stats from your latest profile to your fishing tracker using the API.\n" +
EnumChatFormatting.GOLD + SkyblockPlayersCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find how many players are on each Skyblock island.\n" +
EnumChatFormatting.GOLD + SkillTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for skill xp/hour.\n" +
EnumChatFormatting.GOLD + LobbyBankCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find the average bank total of the lobby, as well the three players with the highest total money in the bank(and purse).\n" +
EnumChatFormatting.GOLD + RepartyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Disbands and reparties all members in the party.\n" +
EnumChatFormatting.GOLD + PlayerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find skills, slayers, coins and weight of a player.\n" +
EnumChatFormatting.GOLD + ReloadConfigCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod config.\n" +
EnumChatFormatting.GOLD + ReloadRepoCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Reloads Danker's Skyblock Mod repository.\n" +
EnumChatFormatting.GOLD + HOTMCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find total powder and HotM tree of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + TrophyFishCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Uses API to find trophy fish stats of a person. If no name is provided, it checks yours.\n" +
EnumChatFormatting.GOLD + StopLobbyCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Stops currently running /lobbyskills or /lobbybank command.\n" +
EnumChatFormatting.GOLD + PowderTrackerCommand.usage(arg0) + EnumChatFormatting.AQUA + " - Text display for powder/hour.\n" +
EnumChatFormatting.GREEN + "Open Maddox Menu" + EnumChatFormatting.AQUA + " - M by default.\n" +
EnumChatFormatting.GREEN + "Regular Ability" + EnumChatFormatting.AQUA + " - Numpad 4 by default.\n" +
EnumChatFormatting.GREEN + "Start/Stop Skill Tracker" + EnumChatFormatting.AQUA + " - Numpad 5 by default.\n" +
EnumChatFormatting.GREEN + "Create Waypoint" + EnumChatFormatting.AQUA + " - Numpad 6 by default.\n" +
EnumChatFormatting.GREEN + "Start/Stop Powder Tracker" + EnumChatFormatting.AQUA + " - Numpad 8 by default.\n"));
}

}
Loading
Loading