Skip to content

Commit

Permalink
Fix SSL
Browse files Browse the repository at this point in the history 
Also replace tabs with spaces
  • Loading branch information
@bowser0000
bowser0000 committed Apr 7, 2024
1 parent 9114710 commit 4f9e0a2
Show file tree
Hide file tree
Showing 27 changed files with 4,196 additions and 4,166 deletions.
36 changes: 18 additions & 18 deletions src/main/java/me/Danker/DankersSkyblockMod.java
View file
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
104 changes: 52 additions & 52 deletions src/main/java/me/Danker/commands/DHelpCommand.java
View file
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

0 comments on commit 4f9e0a2

Please sign in to comment.