From ac98358d28d41031303f035b0e4e3074e252644e Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Sun, 20 Feb 2022 13:49:01 -0500 Subject: Added api key listener --- .../me/xmrvizzy/skyblocker/chat/ChatParser.java | 2 ++ .../skyblocker/config/SkyblockerConfig.java | 3 +++ .../skyblocker/skyblock/api/ApiKeyListener.java | 26 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java index 97ca1f68..6dc8a332 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatParser.java @@ -1,6 +1,7 @@ package me.xmrvizzy.skyblocker.chat; import me.xmrvizzy.skyblocker.chat.filters.*; +import me.xmrvizzy.skyblocker.skyblock.api.ApiKeyListener; import me.xmrvizzy.skyblocker.skyblock.dungeon.Reparty; import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos; import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia; @@ -22,6 +23,7 @@ public class ChatParser { new Fetchur(), new Puzzler(), new Trivia(), + new ApiKeyListener() }; public boolean shouldFilter(String message) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 40b20b98..795699e5 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -30,6 +30,9 @@ public class SkyblockerConfig implements ConfigData { public static class General { + @ConfigEntry.Gui.Excluded + public String apiKey; + @ConfigEntry.Category("bars") @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Bars bars = new Bars(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java new file mode 100644 index 00000000..f20c41d2 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java @@ -0,0 +1,26 @@ +package me.xmrvizzy.skyblocker.skyblock.api; + +import me.shedaniel.autoconfig.AutoConfig; +import me.xmrvizzy.skyblocker.chat.ChatListener; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.TranslatableText; + +public class ApiKeyListener extends ChatListener { + public ApiKeyListener() { + super("^Your new API key is (.*)$"); + } + + @Override + public boolean isEnabled() { + return true; + } + + @Override + public boolean onMessage(String[] groups) { + SkyblockerConfig.get().general.apiKey = groups[1]; + AutoConfig.getConfigHolder(SkyblockerConfig.class).save(); + MinecraftClient.getInstance().player.sendMessage(new TranslatableText("skyblocker.api.got_key"), false); + return false; + } +} -- cgit From 078542d2a3e715d48ace2cc4aad219e67df3f351 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Wed, 23 Feb 2022 16:59:39 -0500 Subject: Add record for API --- .../skyblock/api/records/PlayerProfiles.java | 453 +++++++++++++++++++++ 1 file changed, 453 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java new file mode 100644 index 00000000..94d95000 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java @@ -0,0 +1,453 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records; + +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; +import org.jetbrains.annotations.Nullable; + +import java.util.HashMap; + +@JsonAdapter(RecordTypeAdapterFactory.class) +public record PlayerProfiles(HashMap profiles) { + public record PlayerProfile( + @SerializedName("profile_id") String profileId, + @SerializedName("cute_name") String cuteName, + boolean current, + @SerializedName("last_save") long lastSave, + Items items, + Data data + + ){ + public record Items( + Item[] armor, + Item[][] wardrobe, + Item[] inventory, + Item[] enderchest, + @SerializedName("talisman_bag") Item[] talismanBag, + @SerializedName("fishing_bag") Item[] fishingBag, + Item[] quiver, + @SerializedName("potion_bag") Item[] potionBag, + @SerializedName("personal_vault") Item[] personalVault, + Item[] storage, + Item[] weapons, + Item[] hoes, + Item[] pickaxes, + Item[] rods, + @SerializedName("highest_rarity_sword") Item highestRaritySword, + @SerializedName("highest_rarity_bow") Item highestRarityBow, + @SerializedName("highest_rarity_rod") Item highestRarityRod, + @SerializedName("armor_set_rarity") String armorSetRarity + ){ + public record Item( + @SerializedName("Count") byte count, + int damage, + Tag tag + ){ + public record Tag( + @SerializedName("ExtraAttributes") ExtraAttributes extraAttributes, + Display display, + @SerializedName("SkullOwner") SkullOwner skullOwner + ){ + public record ExtraAttributes(String id){} + public record Display(@SerializedName("Name") String name, @SerializedName("lore") String[] lore, int color){} + public record SkullOwner( + @SerializedName("Id") String id, + @SerializedName("Properties") Properties properties + ){ + public record Properties(HashMap[] textures){} + } + } + } + } + + public record Data( + Stats stats, + @SerializedName("fairy_bonus") Stats fairyBonus, + @SerializedName("fairy_souls") FairySouls fairySouls, + @SerializedName("levels") HashMap skills, + @SerializedName("average_level") double averageLevel, + @SerializedName("average_level_no_progress") double trueAverageLevel, + @SerializedName("total_skill_xp") double totalSkillXp, + @SerializedName("skill_bonus") HashMap skillBonus, + @SerializedName("average_level_rank") double averageLevelRank, + @SerializedName("slayer_coins_spent") HashMap slayerCoinsSpent, + @SerializedName("slayer_bonus") HashMap slayerBonus, + HashMap slayers, + @SerializedName("slayer_xp") int slayerXp, + @SerializedName("display_name") String username, + String uuid, + double bank, + double purse, + @SerializedName("current_area") String currentArea, + Entity[] kills, + Entity[] deaths, + @SerializedName("wardrobe_equipped_slot") int wardrobeEquippedSlot, + @SerializedName("skin_data") SkinData skinData, + Profile profile, + Member[] members, + Minion[] minions, + @SerializedName("minion_slots") MinionSlots minionSlots, + HashMap collections, + Social social, + Dungeons dungeons, + Fishing fishing, + Farming farming, + Enchanting Enchanting, + Mining mining, + Misc misc, + @SerializedName("auctions_bought") Auctions auctionsBought, + @SerializedName("auctions_sold") Auctions auctionsSold, + @SerializedName("last_updated") LastUpdated lastUpdated, + @SerializedName("first_join") LastUpdated firstJoin + + ){ + public record Stats( + int health, + int defense, + @SerializedName("effective_health") int effectiveHealth, + int strength, + int speed, + @SerializedName("crit_chance") double critChance, + @SerializedName("crit_damage") int critDamage, + @SerializedName("bonus_attack_speed") int bonusAttackSpeed, + int intelligence, + @SerializedName("sea_creature_chance") int seaCreatureChance, + @SerializedName("magic_find") int magicFind, + @SerializedName("pet_luck") int petLuck, + int ferocity, + @SerializedName("ability_damage") double abilityDamage, + @SerializedName("mining_speed") int miningSpeed, + @SerializedName("mining_fortune") int miningFortune, + @SerializedName("farming_fortune") int farmingFortune, + @SerializedName("foraging_fortune") int foragingFortune, + int pristine, + int damage, + @SerializedName("damage_increase") double damageIncrease + ){} + public record FairySouls(int collected, int total, double progress){} + public record Level( + Double xp, + Integer level, + Integer maxLevel, + Long xpCurrent, + Integer xpForNext, + Double progress, + Integer levelCap, + Integer uncappedLevel, + Integer rank, + Double levelWithProgress, + Double unlockableLevelWithProgress + ){} + public record Slayer( + Level level, + Kills kills, + @SerializedName("claimed_levels") ClaimedLevels claimedLevels, + int xp, + @SerializedName("boss_kills_tier_0") int bossKillsTier0, + @SerializedName("boss_kills_tier_1") int bossKillsTier1, + @SerializedName("boss_kills_tier_2") int bossKillsTier2, + @SerializedName("boss_kills_tier_3") int bossKillsTier3 + ){ + public record Level( + short currentLevel, + int xp, + short maxLevel, + Double progress, + int xpForNext + ){} + public record Kills(@Nullable HashMap kills){} + public record ClaimedLevels( + @SerializedName("level_1") boolean level1, + @SerializedName("level_2") boolean level2, + @SerializedName("level_3") boolean level3, + @SerializedName("level_4") boolean level4, + @SerializedName("level_5") boolean level5, + @SerializedName("level_6") boolean level6, + @SerializedName("level_7_special") boolean level7 + ){} + + } + public record Entity(String type, String entityId, int amount, String entityName){} + public record SkinData(@SerializedName("skinurl") String skinUrl, String model){} + public record Profile(String gamemode){} + public record Member( + String uuid, + @SerializedName("display_name") String displayName, + @SerializedName("last_updated") LastUpdated lastUpdated, + @SerializedName("skin_data") SkinData skinData + ){} + public record LastUpdated(long unix, String text){} + public record Minion( + String id, + String type, + int tiers, + String name, + Integer[] levels + + ){} + public record MinionSlots(int currentSlots, int toNext, int toNextSlot){} + public record Collection(int tier, long amount, long totalAmount, UserAmount[] amounts){ + public record UserAmount(String username, long amount){} + } + public record Social( + @SerializedName("DISCORD") String discord, + @SerializedName("HYPIXEL") String hypixel, + @SerializedName("TWITTER") String twitter, + @SerializedName("YOUTUBE") String youtube, + @SerializedName("INSTAGRAM") String instagram, + @SerializedName("TWITCH") String twitch + ){} + public record Dungeons( + Dungeon catacombs, + @SerializedName("master_catacombs") Dungeon masterCatacombs, + HashMap classes, + @SerializedName("used_classes") boolean usedClasses, + @SerializedName("selected_class") String selectedClass, + @SerializedName("secrets_found") int secretsFound, + HashMap essence, + @SerializedName("unlocked_collections") boolean unlockedCollections, + @SerializedName("boss_collections") HashMap bossCollections, + Journals journals + + ){ + public record Dungeon( + String id, + boolean visited, + Level level, + @SerializedName("highest_floor") String highestFloor, + HashMap floors + + ){} + public record Collection( + String name, + String texture, + int tier, + boolean maxed, + int killed, + HashMap floors, + int unclaimed, + String[] claimed + ){} + public record Journals( + @SerializedName("pages_completed") int pagesCompleted, + @SerializedName("journals_completed") int journalsCompleted, + @SerializedName("total_pages") Integer totalPages, + boolean maxed, + @SerializedName("journal_entries") Entry[] journalEntries + + ){ + public record Entry( + String name, + @SerializedName("pages_collected") int pagesCollected, + @SerializedName("total_pages") Integer totalPages + ){} + } + public record Class(Level experience, boolean current){} + public record Floor( + String name, + Stats stats, + @SerializedName("most_damage") MostDamage mostDamage, + Bonuses bonuses + + ){ + public record Stats( + @SerializedName("times_played") int timesPlayed, + @SerializedName("best_score") int bestScore, + @SerializedName("mobs_killed") int mobsKilled, + @SerializedName("most_mobs_killed") int mostMobsKilled, + @SerializedName("most_healing") double mostHealing, + @SerializedName("tier_completions") int tierCompletions, + @SerializedName("fastest_time") long fastestTime, + @SerializedName("watcher_kills") int watcherKills, + @SerializedName("best_runs") Run[] bestRuns + ){} + public record MostDamage( + @SerializedName("class") String classUsed, + @SerializedName("value") double damage + ){} + public record Run( + long timestamp, + @SerializedName("score_exploration") int scoreExploration, + @SerializedName("score_speed") int scoreSpeed, + @SerializedName("score_skill") int scoreSkill, + @SerializedName("score_bonus") int scoreBonus, + @SerializedName("dungeon_class") int dungeonClass, + String[] teammates, + @SerializedName("elapsed_time") long elapsedTime, + @SerializedName("damaged_dealt") int damageDealt, + int deaths, + @SerializedName("mobs_killed") int mobsKilled, + @SerializedName("secrets_found") int secretsFound, + @SerializedName("damage_mitigated") double damageMitigated, + @SerializedName("ally_healing") int allyHealing + ){} + public record Bonuses(@SerializedName("item_boost") int itemBoost){} + } + } + public record Fishing( + int total, + int treasure, + @SerializedName("treasure_large") int treasureLarge, + @SerializedName("shredder_fished") int shredderFished, + @SerializedName("shredder_bait") int shredderBait + ){} + public record Farming( + boolean talked, + @SerializedName("current_badges") Badges currentBadges, + @SerializedName("total_badges") Badges totalBadges, + Perks perks, + @SerializedName("unique_golds") int unique_golds, + HashMap crops, + Contests contests + ){ + public record Badges(int bronze, int silver, int gold){} + public record Perks(@SerializedName("double_drops") int doubleDrops, @SerializedName("farming_level_cap") int farmingLevelCap){} + public record Crop( + String name, + boolean attended, + @SerializedName("unique_gold") boolean uniqueGold, + int contests, + @SerializedName("personal_best") int personalBest, + Badges badges + ){} + public record Contests(@SerializedName("attended_contests") int attendedContests, @SerializedName("all_contests") Contest[] allContests){} + public record Contest(String date, String crop, int collected, boolean claimed, String medal, Placing placing){ + public record Placing(int position, double percentage){} + } + } + public record Enchanting(boolean experimented, HashMap experiments){ + public record Experiment( + String name, + Stats stats, + Tier[] tiers + + ){ + public record Stats( + @SerializedName("last_attempt") LastUpdated lastAttempt, + @SerializedName("bonus_clicks") int bonusClicks, + @SerializedName("last_claimed") LastUpdated lastClaimed + ){} + public record Tier( + String name, + int attempts, + int claims, + @SerializedName("best_score") int bestScore + ){} + } + } + public record Mining( + Commissions commissions, + Forge forge, + Core core + ){ + public record Forge(Process[] processes){ + public record Process( + String id, + int slot, + long timeFinished, + String timeFinishedText, + String name + ){} + } + public record Commissions(int milestone){} + public record Core( + Level tier, + Spent tokens, + @SerializedName("selected_pickaxe_ability") String selectedMiningAbility, + HashMap powder, + @SerializedName("crystal_nucleus") Nucleus crystalNucleus, + @SerializedName("daily_ores") DailyOres dailyOres, + @SerializedName("hotm_last_reset") long hotmLastReset, + @SerializedName("crystal_hollows_last_access") long crystalHollowsLastAccess + ){ + public record Spent(int total, int spent, int available){} + public record Nucleus( + @SerializedName("times_completed") int timesCompleted, + HashMap crystals, + Goblin goblin + ){ + public record Crystal( + String state, + @SerializedName("total_placed") int totalPlaced, + @SerializedName("total_found") int totalFound + ){} + public record Goblin( + @SerializedName("king_quest_active") boolean kingQuestActive, + @SerializedName("king_quest_completed") boolean kingQuestCompleted + ){} + } + public record DailyOres( + int mined, + int day, + @SerializedName("daily_ores") HashMap dailyOres + ){ + public record Ore(int day, int count){} + } + } + } + public record Misc( + Milestones milestones, + Gifts gifts, + Winter winter, + Dragons dragons, + Protector protector, + Damage damage, + Burrows burrows, + ProfileUpgrades profileUpgrades + ){ + public record Milestones( + @SerializedName("ores_mined") int oresMined, + @SerializedName("sea_creatures_killed") int seaCreaturesKilled + ){} + public record Gifts(@SerializedName("gifts_given") int giftsGiven){} + public record Winter( + @SerializedName("most_winter_snowballs_hit") int mostWinterSnowballsHit, + @SerializedName("most_winter_damage_dealt") int mostWinterDamageDealt, + @SerializedName("most_winter_magma_damage_dealt") int mostWinterMagmaDamageDealt + ){} + public record Dragons( + @SerializedName("ender_crystals_destroyed") int enderCrystalsDestroyed, + @SerializedName("last_hits") int lastHits, + @SerializedName("deaths") int deaths + ){} + public record Protector( + @SerializedName("last_hits") int lastHits, + int deaths + ){} + public record Damage(@SerializedName("highest_critical_damage") double highestCriticalDamage){} + public record Burrows( + @SerializedName("dug_next") Rarities dugNext, + @SerializedName("dug_combat") Rarities dugCombat, + @SerializedName("dug_treasure") Rarities dugTreasure, + @SerializedName("chains_complete") Rarities chainsComplete + ){ + public record Rarities( + int total, + @SerializedName("null") int common, + int uncommon, + int rare, + int epic, + int legendary + ){} + } + public record ProfileUpgrades( + @SerializedName("island_size") int islandSize, + @SerializedName("minion_slots") int minionSlots, + @SerializedName("guest_count") int guestCount, + @SerializedName("coop_slots") int coopSlots, + @SerializedName("coins_allowance") int coinsAllowance + ){} + } + public record Auctions( + int uncommon, + int rare, + int epic, + int common, + int legendary, + int special + ){} + } + + } +} + -- cgit From 95564f862bed491d300d9f47a0810d2a9251373a Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Wed, 23 Feb 2022 17:00:16 -0500 Subject: Add command to actually check if it works... --- .../xmrvizzy/skyblocker/SkyblockerInitializer.java | 2 ++ .../skyblocker/skyblock/api/ProfileUtils.java | 27 ++++++++++++++++++++++ .../skyblocker/skyblock/api/StatsCommand.java | 26 +++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java index 46cd0bb2..e1d1b612 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java @@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock; +import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup; import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry; @@ -15,5 +16,6 @@ public class SkyblockerInitializer implements ClientModInitializer { PriceInfoTooltip.init(); WikiLookup.init(); ItemRegistry.init(); + StatsCommand.init(); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java new file mode 100644 index 00000000..5c74bdf8 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java @@ -0,0 +1,27 @@ +package me.xmrvizzy.skyblocker.skyblock.api; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + +public class ProfileUtils { + public static PlayerProfiles getProfiles(String name){ + try { + URL url = new URL("https://sky.shiiyu.moe/api/v2/profile/" + name); + InputStreamReader reader = new InputStreamReader(url.openStream()); + Gson gson = new GsonBuilder() + .registerTypeAdapterFactory(RecordTypeAdapterFactory.builder().allowMissingComponentValues().create()) + .serializeNulls() + .create(); + return gson.fromJson(reader, PlayerProfiles.class); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java new file mode 100644 index 00000000..292abe7a --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java @@ -0,0 +1,26 @@ +package me.xmrvizzy.skyblocker.skyblock.api; + +import com.mojang.brigadier.arguments.StringArgumentType; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; +import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; + +import java.text.DecimalFormat; + +public class StatsCommand { + public static void init(){ + ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("skyblocker") + .then(ClientCommandManager.literal("debug") + .then(ClientCommandManager.literal("stats").then(ClientCommandManager.argument("username", StringArgumentType.string()) + .then(ClientCommandManager.argument("cute name", StringArgumentType.string()).executes(context -> { + new Thread(() -> { + PlayerProfiles playerProfiles = ProfileUtils.getProfiles(StringArgumentType.getString(context, "username")); + for (String profileId : playerProfiles.profiles().keySet()){ + if (playerProfiles.profiles().get(profileId).cuteName().equalsIgnoreCase(StringArgumentType.getString(context, "cute name"))){ + System.out.println(playerProfiles); + } + } + }).start(); + return 1; + })))))); + } +} -- cgit From 97f93d2615eb05df8981eb641c7c52da664e9bd1 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Fri, 25 Feb 2022 21:12:43 -0500 Subject: Added API inventor converter --- .../skyblocker/skyblock/api/ProfileUtils.java | 84 ++++++++++++++++++++++ .../skyblocker/skyblock/api/StatsCommand.java | 4 +- .../skyblock/api/records/PlayerProfiles.java | 13 ++-- 3 files changed, 94 insertions(+), 7 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java index 5c74bdf8..e6efc26c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java @@ -2,12 +2,25 @@ package me.xmrvizzy.skyblocker.skyblock.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; +import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemFixerUpper; +import net.minecraft.client.MinecraftClient; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.nbt.*; +import net.minecraft.text.Text; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; public class ProfileUtils { public static PlayerProfiles getProfiles(String name){ @@ -24,4 +37,75 @@ public class ProfileUtils { } return null; } + + public static List itemsFromApiInventory(PlayerProfiles.PlayerProfile.Items.Item[] items){ + List inventory = new ArrayList<>(); + for (PlayerProfiles.PlayerProfile.Items.Item item : items){ + try{ + if (item.tag() != null){ + JsonObject obj = new Gson().fromJson(Files.readString(Path.of("./config/skyblocker/items-repo/items/" + item.tag().extraAttributes().id() + ".json")), JsonObject.class); + + NbtCompound root = new NbtCompound(); + root.put("Count", NbtByte.of(item.count())); + root.put("id", NbtString.of(ItemFixerUpper.convertItemId(obj.get("itemid").getAsString(), obj.get("damage").getAsInt()))); + NbtCompound tag = new NbtCompound(); + root.put("tag", tag); + + if (item.tag().ench() != null){ + NbtList enchantments = new NbtList(); + enchantments.add(new NbtCompound()); + tag.put("Enchantments", enchantments); + } + + NbtCompound extraAttributes = new NbtCompound(); + tag.put("ExtraAttributes", extraAttributes); + extraAttributes.put("id", NbtString.of(item.tag().extraAttributes().id())); + if (item.tag().extraAttributes().enchantments() != null){ + NbtCompound enchantments = new NbtCompound(); + extraAttributes.put("enchantments", enchantments); + for (String enchant : item.tag().extraAttributes().enchantments().keySet()){ + enchantments.put(enchant, NbtInt.of(item.tag().extraAttributes().enchantments().get(enchant))); + } + } + + NbtCompound display = new NbtCompound(); + tag.put("display", display); + display.put("Name", NbtString.of(Text.Serializer.toJson(Text.of(item.tag().display().name())))); + if (item.tag().display().lore() != null){ + NbtList lore = new NbtList(); + display.put("Lore", lore); + for (int i = 0; i < item.tag().display().lore().length; i++) { + if (i < item.tag().display().lore().length - 1) + lore.add(i, NbtString.of(Text.Serializer.toJson(Text.of(Arrays.stream(item.tag().display().lore()).toArray()[i].toString())))); + } + } + if (item.tag().display().color() != null){ + display.put("color", NbtInt.of(item.tag().display().color())); + } + + if (item.tag().skullOwner() != null){ + NbtCompound skullOwner = new NbtCompound(); + tag.put("SkullOwner", skullOwner); + UUID uuid = UUID.fromString(item.tag().skullOwner().id()); + skullOwner.put("Id", NbtHelper.fromUuid(uuid)); + skullOwner.put("Name", NbtString.of(item.tag().extraAttributes().id())); + + NbtCompound properties = new NbtCompound(); + skullOwner.put("Properties", properties); + NbtList textures = new NbtList(); + properties.put("textures", textures); + NbtCompound texture = new NbtCompound(); + textures.add(texture); + texture.put("Value", NbtString.of(item.tag().skullOwner().properties().textures()[0].get("Value"))); + } + inventory.add(ItemStack.fromNbt(root)); + } else { + inventory.add(Items.AIR.getDefaultStack()); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return inventory; + } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java index 292abe7a..67e3260b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java @@ -15,9 +15,7 @@ public class StatsCommand { new Thread(() -> { PlayerProfiles playerProfiles = ProfileUtils.getProfiles(StringArgumentType.getString(context, "username")); for (String profileId : playerProfiles.profiles().keySet()){ - if (playerProfiles.profiles().get(profileId).cuteName().equalsIgnoreCase(StringArgumentType.getString(context, "cute name"))){ - System.out.println(playerProfiles); - } + System.out.println("Just imagine it did something"); } }).start(); return 1; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java index 94d95000..1fd6579b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java @@ -41,21 +41,26 @@ public record PlayerProfiles(HashMap profiles) { public record Item( @SerializedName("Count") byte count, int damage, - Tag tag + Tag tag, + boolean isInactive, + boolean inBackpack, + Item[] containsItems ){ public record Tag( @SerializedName("ExtraAttributes") ExtraAttributes extraAttributes, Display display, - @SerializedName("SkullOwner") SkullOwner skullOwner + @SerializedName("SkullOwner") SkullOwner skullOwner, + Enchant[] ench ){ - public record ExtraAttributes(String id){} - public record Display(@SerializedName("Name") String name, @SerializedName("lore") String[] lore, int color){} + public record ExtraAttributes(String id, HashMap enchantments){} + public record Display(@SerializedName("Name") String name, @SerializedName("Lore") String[] lore, Integer color){} public record SkullOwner( @SerializedName("Id") String id, @SerializedName("Properties") Properties properties ){ public record Properties(HashMap[] textures){} } + public record Enchant(int lvl, int id){} } } } -- cgit From 0313f19bc4aeccecfd43d18875aeb590a9b75c4e Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Sat, 26 Feb 2022 13:45:01 -0500 Subject: Added functionality to profile debug command --- .../java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java index 67e3260b..8ce7facb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java @@ -1,10 +1,12 @@ package me.xmrvizzy.skyblocker.skyblock.api; +import com.google.gson.GsonBuilder; import com.mojang.brigadier.arguments.StringArgumentType; import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager; - -import java.text.DecimalFormat; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.LiteralText; public class StatsCommand { public static void init(){ @@ -15,7 +17,8 @@ public class StatsCommand { new Thread(() -> { PlayerProfiles playerProfiles = ProfileUtils.getProfiles(StringArgumentType.getString(context, "username")); for (String profileId : playerProfiles.profiles().keySet()){ - System.out.println("Just imagine it did something"); + MinecraftClient.getInstance().player.sendMessage(new LiteralText(playerProfiles.profiles().get(profileId).cuteName()) + .styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, new GsonBuilder().serializeNulls().setPrettyPrinting().create().toJson(playerProfiles.profiles().get(profileId))))), false); } }).start(); return 1; -- cgit From c632eee0e91d56b198b01170a656bcd38abbc5c2 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Sat, 26 Feb 2022 14:02:27 -0500 Subject: removed useless arg --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java index 8ce7facb..b401905f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java @@ -13,7 +13,7 @@ public class StatsCommand { ClientCommandManager.DISPATCHER.register(ClientCommandManager.literal("skyblocker") .then(ClientCommandManager.literal("debug") .then(ClientCommandManager.literal("stats").then(ClientCommandManager.argument("username", StringArgumentType.string()) - .then(ClientCommandManager.argument("cute name", StringArgumentType.string()).executes(context -> { + .executes(context -> { new Thread(() -> { PlayerProfiles playerProfiles = ProfileUtils.getProfiles(StringArgumentType.getString(context, "username")); for (String profileId : playerProfiles.profiles().keySet()){ @@ -22,6 +22,6 @@ public class StatsCommand { } }).start(); return 1; - })))))); + }))))); } } -- cgit From 3f05ebcfc85f0edc8c4147dd30f0d5f00ebb9487 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:35:56 -0500 Subject: splitting it all into separate files --- .../skyblock/api/records/Enchanting.java | 27 ++ .../skyblocker/skyblock/api/records/Farming.java | 30 ++ .../skyblocker/skyblock/api/records/Items.java | 52 ++++ .../skyblock/api/records/PlayerProfiles.java | 314 +-------------------- .../skyblocker/skyblock/api/records/Slayer.java | 29 ++ .../skyblock/api/records/dungeons/Dungeons.java | 40 +++ .../skyblock/api/records/dungeons/Floor.java | 44 +++ .../skyblock/api/records/dungeons/Journals.java | 18 ++ .../skyblock/api/records/mining/Core.java | 41 +++ .../skyblock/api/records/mining/Mining.java | 23 ++ .../skyblock/api/records/misc/Burrows.java | 19 ++ .../skyblocker/skyblock/api/records/misc/Misc.java | 42 +++ 12 files changed, 368 insertions(+), 311 deletions(-) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java new file mode 100644 index 00000000..42538e42 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java @@ -0,0 +1,27 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records; + +import com.google.gson.annotations.SerializedName; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; + +import java.util.HashMap; + +public record Enchanting(boolean experimented, HashMap experiments){ + public record Experiment( + String name, + Stats stats, + Tier[] tiers + + ){ + public record Stats( + @SerializedName("last_attempt") PlayerProfiles.PlayerProfile.Data.LastUpdated lastAttempt, + @SerializedName("bonus_clicks") int bonusClicks, + @SerializedName("last_claimed") PlayerProfiles.PlayerProfile.Data.LastUpdated lastClaimed + ){} + public record Tier( + String name, + int attempts, + int claims, + @SerializedName("best_score") int bestScore + ){} + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java new file mode 100644 index 00000000..87325819 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java @@ -0,0 +1,30 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records; + +import com.google.gson.annotations.SerializedName; + +import java.util.HashMap; + +public record Farming( + boolean talked, + @SerializedName("current_badges") Badges currentBadges, + @SerializedName("total_badges") Badges totalBadges, + Perks perks, + @SerializedName("unique_golds") int unique_golds, + HashMap crops, + Contests contests +){ + public record Badges(int bronze, int silver, int gold){} + public record Perks(@SerializedName("double_drops") int doubleDrops, @SerializedName("farming_level_cap") int farmingLevelCap){} + public record Crop( + String name, + boolean attended, + @SerializedName("unique_gold") boolean uniqueGold, + int contests, + @SerializedName("personal_best") int personalBest, + Badges badges + ){} + public record Contests(@SerializedName("attended_contests") int attendedContests, @SerializedName("all_contests") Contest[] allContests){} + public record Contest(String date, String crop, int collected, boolean claimed, String medal, Placing placing){ + public record Placing(int position, double percentage){} + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java new file mode 100644 index 00000000..28a4e4af --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java @@ -0,0 +1,52 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records; + +import com.google.gson.annotations.SerializedName; + +import java.util.HashMap; + +public record Items( + Item[] armor, + Item[][] wardrobe, + Item[] inventory, + Item[] enderchest, + @SerializedName("talisman_bag") Item[] talismanBag, + @SerializedName("fishing_bag") Item[] fishingBag, + Item[] quiver, + @SerializedName("potion_bag") Item[] potionBag, + @SerializedName("personal_vault") Item[] personalVault, + Item[] storage, + Item[] weapons, + Item[] hoes, + Item[] pickaxes, + Item[] rods, + @SerializedName("highest_rarity_sword") Item highestRaritySword, + @SerializedName("highest_rarity_bow") Item highestRarityBow, + @SerializedName("highest_rarity_rod") Item highestRarityRod, + @SerializedName("armor_set_rarity") String armorSetRarity +){ + public record Item( + @SerializedName("Count") byte count, + int damage, + Tag tag, + boolean isInactive, + boolean inBackpack, + Item[] containsItems + ){ + public record Tag( + @SerializedName("ExtraAttributes") ExtraAttributes extraAttributes, + Display display, + @SerializedName("SkullOwner") SkullOwner skullOwner, + Enchant[] ench + ){ + public record ExtraAttributes(String id, HashMap enchantments){} + public record Display(@SerializedName("Name") String name, @SerializedName("Lore") String[] lore, Integer color){} + public record SkullOwner( + @SerializedName("Id") String id, + @SerializedName("Properties") Properties properties + ){ + public record Properties(HashMap[] textures){} + } + public record Enchant(int lvl, int id){} + } + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java index 1fd6579b..c880f5de 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java @@ -3,7 +3,9 @@ package me.xmrvizzy.skyblocker.skyblock.api.records; import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; -import org.jetbrains.annotations.Nullable; +import me.xmrvizzy.skyblocker.skyblock.api.records.dungeons.Dungeons; +import me.xmrvizzy.skyblocker.skyblock.api.records.mining.Mining; +import me.xmrvizzy.skyblocker.skyblock.api.records.misc.Misc; import java.util.HashMap; @@ -18,53 +20,6 @@ public record PlayerProfiles(HashMap profiles) { Data data ){ - public record Items( - Item[] armor, - Item[][] wardrobe, - Item[] inventory, - Item[] enderchest, - @SerializedName("talisman_bag") Item[] talismanBag, - @SerializedName("fishing_bag") Item[] fishingBag, - Item[] quiver, - @SerializedName("potion_bag") Item[] potionBag, - @SerializedName("personal_vault") Item[] personalVault, - Item[] storage, - Item[] weapons, - Item[] hoes, - Item[] pickaxes, - Item[] rods, - @SerializedName("highest_rarity_sword") Item highestRaritySword, - @SerializedName("highest_rarity_bow") Item highestRarityBow, - @SerializedName("highest_rarity_rod") Item highestRarityRod, - @SerializedName("armor_set_rarity") String armorSetRarity - ){ - public record Item( - @SerializedName("Count") byte count, - int damage, - Tag tag, - boolean isInactive, - boolean inBackpack, - Item[] containsItems - ){ - public record Tag( - @SerializedName("ExtraAttributes") ExtraAttributes extraAttributes, - Display display, - @SerializedName("SkullOwner") SkullOwner skullOwner, - Enchant[] ench - ){ - public record ExtraAttributes(String id, HashMap enchantments){} - public record Display(@SerializedName("Name") String name, @SerializedName("Lore") String[] lore, Integer color){} - public record SkullOwner( - @SerializedName("Id") String id, - @SerializedName("Properties") Properties properties - ){ - public record Properties(HashMap[] textures){} - } - public record Enchant(int lvl, int id){} - } - } - } - public record Data( Stats stats, @SerializedName("fairy_bonus") Stats fairyBonus, @@ -143,35 +98,6 @@ public record PlayerProfiles(HashMap profiles) { Double levelWithProgress, Double unlockableLevelWithProgress ){} - public record Slayer( - Level level, - Kills kills, - @SerializedName("claimed_levels") ClaimedLevels claimedLevels, - int xp, - @SerializedName("boss_kills_tier_0") int bossKillsTier0, - @SerializedName("boss_kills_tier_1") int bossKillsTier1, - @SerializedName("boss_kills_tier_2") int bossKillsTier2, - @SerializedName("boss_kills_tier_3") int bossKillsTier3 - ){ - public record Level( - short currentLevel, - int xp, - short maxLevel, - Double progress, - int xpForNext - ){} - public record Kills(@Nullable HashMap kills){} - public record ClaimedLevels( - @SerializedName("level_1") boolean level1, - @SerializedName("level_2") boolean level2, - @SerializedName("level_3") boolean level3, - @SerializedName("level_4") boolean level4, - @SerializedName("level_5") boolean level5, - @SerializedName("level_6") boolean level6, - @SerializedName("level_7_special") boolean level7 - ){} - - } public record Entity(String type, String entityId, int amount, String entityName){} public record SkinData(@SerializedName("skinurl") String skinUrl, String model){} public record Profile(String gamemode){} @@ -202,93 +128,6 @@ public record PlayerProfiles(HashMap profiles) { @SerializedName("INSTAGRAM") String instagram, @SerializedName("TWITCH") String twitch ){} - public record Dungeons( - Dungeon catacombs, - @SerializedName("master_catacombs") Dungeon masterCatacombs, - HashMap classes, - @SerializedName("used_classes") boolean usedClasses, - @SerializedName("selected_class") String selectedClass, - @SerializedName("secrets_found") int secretsFound, - HashMap essence, - @SerializedName("unlocked_collections") boolean unlockedCollections, - @SerializedName("boss_collections") HashMap bossCollections, - Journals journals - - ){ - public record Dungeon( - String id, - boolean visited, - Level level, - @SerializedName("highest_floor") String highestFloor, - HashMap floors - - ){} - public record Collection( - String name, - String texture, - int tier, - boolean maxed, - int killed, - HashMap floors, - int unclaimed, - String[] claimed - ){} - public record Journals( - @SerializedName("pages_completed") int pagesCompleted, - @SerializedName("journals_completed") int journalsCompleted, - @SerializedName("total_pages") Integer totalPages, - boolean maxed, - @SerializedName("journal_entries") Entry[] journalEntries - - ){ - public record Entry( - String name, - @SerializedName("pages_collected") int pagesCollected, - @SerializedName("total_pages") Integer totalPages - ){} - } - public record Class(Level experience, boolean current){} - public record Floor( - String name, - Stats stats, - @SerializedName("most_damage") MostDamage mostDamage, - Bonuses bonuses - - ){ - public record Stats( - @SerializedName("times_played") int timesPlayed, - @SerializedName("best_score") int bestScore, - @SerializedName("mobs_killed") int mobsKilled, - @SerializedName("most_mobs_killed") int mostMobsKilled, - @SerializedName("most_healing") double mostHealing, - @SerializedName("tier_completions") int tierCompletions, - @SerializedName("fastest_time") long fastestTime, - @SerializedName("watcher_kills") int watcherKills, - @SerializedName("best_runs") Run[] bestRuns - ){} - public record MostDamage( - @SerializedName("class") String classUsed, - @SerializedName("value") double damage - ){} - public record Run( - long timestamp, - @SerializedName("score_exploration") int scoreExploration, - @SerializedName("score_speed") int scoreSpeed, - @SerializedName("score_skill") int scoreSkill, - @SerializedName("score_bonus") int scoreBonus, - @SerializedName("dungeon_class") int dungeonClass, - String[] teammates, - @SerializedName("elapsed_time") long elapsedTime, - @SerializedName("damaged_dealt") int damageDealt, - int deaths, - @SerializedName("mobs_killed") int mobsKilled, - @SerializedName("secrets_found") int secretsFound, - @SerializedName("damage_mitigated") double damageMitigated, - @SerializedName("ally_healing") int allyHealing - ){} - public record Bonuses(@SerializedName("item_boost") int itemBoost){} - } - } public record Fishing( int total, int treasure, @@ -296,153 +135,6 @@ public record PlayerProfiles(HashMap profiles) { @SerializedName("shredder_fished") int shredderFished, @SerializedName("shredder_bait") int shredderBait ){} - public record Farming( - boolean talked, - @SerializedName("current_badges") Badges currentBadges, - @SerializedName("total_badges") Badges totalBadges, - Perks perks, - @SerializedName("unique_golds") int unique_golds, - HashMap crops, - Contests contests - ){ - public record Badges(int bronze, int silver, int gold){} - public record Perks(@SerializedName("double_drops") int doubleDrops, @SerializedName("farming_level_cap") int farmingLevelCap){} - public record Crop( - String name, - boolean attended, - @SerializedName("unique_gold") boolean uniqueGold, - int contests, - @SerializedName("personal_best") int personalBest, - Badges badges - ){} - public record Contests(@SerializedName("attended_contests") int attendedContests, @SerializedName("all_contests") Contest[] allContests){} - public record Contest(String date, String crop, int collected, boolean claimed, String medal, Placing placing){ - public record Placing(int position, double percentage){} - } - } - public record Enchanting(boolean experimented, HashMap experiments){ - public record Experiment( - String name, - Stats stats, - Tier[] tiers - - ){ - public record Stats( - @SerializedName("last_attempt") LastUpdated lastAttempt, - @SerializedName("bonus_clicks") int bonusClicks, - @SerializedName("last_claimed") LastUpdated lastClaimed - ){} - public record Tier( - String name, - int attempts, - int claims, - @SerializedName("best_score") int bestScore - ){} - } - } - public record Mining( - Commissions commissions, - Forge forge, - Core core - ){ - public record Forge(Process[] processes){ - public record Process( - String id, - int slot, - long timeFinished, - String timeFinishedText, - String name - ){} - } - public record Commissions(int milestone){} - public record Core( - Level tier, - Spent tokens, - @SerializedName("selected_pickaxe_ability") String selectedMiningAbility, - HashMap powder, - @SerializedName("crystal_nucleus") Nucleus crystalNucleus, - @SerializedName("daily_ores") DailyOres dailyOres, - @SerializedName("hotm_last_reset") long hotmLastReset, - @SerializedName("crystal_hollows_last_access") long crystalHollowsLastAccess - ){ - public record Spent(int total, int spent, int available){} - public record Nucleus( - @SerializedName("times_completed") int timesCompleted, - HashMap crystals, - Goblin goblin - ){ - public record Crystal( - String state, - @SerializedName("total_placed") int totalPlaced, - @SerializedName("total_found") int totalFound - ){} - public record Goblin( - @SerializedName("king_quest_active") boolean kingQuestActive, - @SerializedName("king_quest_completed") boolean kingQuestCompleted - ){} - } - public record DailyOres( - int mined, - int day, - @SerializedName("daily_ores") HashMap dailyOres - ){ - public record Ore(int day, int count){} - } - } - } - public record Misc( - Milestones milestones, - Gifts gifts, - Winter winter, - Dragons dragons, - Protector protector, - Damage damage, - Burrows burrows, - ProfileUpgrades profileUpgrades - ){ - public record Milestones( - @SerializedName("ores_mined") int oresMined, - @SerializedName("sea_creatures_killed") int seaCreaturesKilled - ){} - public record Gifts(@SerializedName("gifts_given") int giftsGiven){} - public record Winter( - @SerializedName("most_winter_snowballs_hit") int mostWinterSnowballsHit, - @SerializedName("most_winter_damage_dealt") int mostWinterDamageDealt, - @SerializedName("most_winter_magma_damage_dealt") int mostWinterMagmaDamageDealt - ){} - public record Dragons( - @SerializedName("ender_crystals_destroyed") int enderCrystalsDestroyed, - @SerializedName("last_hits") int lastHits, - @SerializedName("deaths") int deaths - ){} - public record Protector( - @SerializedName("last_hits") int lastHits, - int deaths - ){} - public record Damage(@SerializedName("highest_critical_damage") double highestCriticalDamage){} - public record Burrows( - @SerializedName("dug_next") Rarities dugNext, - @SerializedName("dug_combat") Rarities dugCombat, - @SerializedName("dug_treasure") Rarities dugTreasure, - @SerializedName("chains_complete") Rarities chainsComplete - ){ - public record Rarities( - int total, - @SerializedName("null") int common, - int uncommon, - int rare, - int epic, - int legendary - ){} - } - public record ProfileUpgrades( - @SerializedName("island_size") int islandSize, - @SerializedName("minion_slots") int minionSlots, - @SerializedName("guest_count") int guestCount, - @SerializedName("coop_slots") int coopSlots, - @SerializedName("coins_allowance") int coinsAllowance - ){} - } public record Auctions( int uncommon, int rare, diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java new file mode 100644 index 00000000..77c73b0c --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java @@ -0,0 +1,29 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records; + +import com.google.gson.annotations.SerializedName; +import org.jetbrains.annotations.Nullable; + +import java.util.HashMap; + +public record Slayer( + PlayerProfiles.PlayerProfile.Data.Level level, + Kills kills, + @SerializedName("claimed_levels") ClaimedLevels claimedLevels, + int xp, + @SerializedName("boss_kills_tier_0") int bossKillsTier0, + @SerializedName("boss_kills_tier_1") int bossKillsTier1, + @SerializedName("boss_kills_tier_2") int bossKillsTier2, + @SerializedName("boss_kills_tier_3") int bossKillsTier3 +){ + public record Kills(@Nullable HashMap kills){} + public record ClaimedLevels( + @SerializedName("level_1") boolean level1, + @SerializedName("level_2") boolean level2, + @SerializedName("level_3") boolean level3, + @SerializedName("level_4") boolean level4, + @SerializedName("level_5") boolean level5, + @SerializedName("level_6") boolean level6, + @SerializedName("level_7_special") boolean level7 + ){} + +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java new file mode 100644 index 00000000..64c4c99c --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java @@ -0,0 +1,40 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons; + +import com.google.gson.annotations.SerializedName; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; + +import java.util.HashMap; + +public record Dungeons( + Dungeon catacombs, + @SerializedName("master_catacombs") Dungeon masterCatacombs, + HashMap classes, + @SerializedName("used_classes") boolean usedClasses, + @SerializedName("selected_class") String selectedClass, + @SerializedName("secrets_found") int secretsFound, + HashMap essence, + @SerializedName("unlocked_collections") boolean unlockedCollections, + @SerializedName("boss_collections") HashMap bossCollections, + Journals journals + +){ + public record Dungeon( + String id, + boolean visited, + PlayerProfiles.PlayerProfile.Data.Level level, + @SerializedName("highest_floor") String highestFloor, + HashMap floors + + ){} + public record Collection( + String name, + String texture, + int tier, + boolean maxed, + int killed, + HashMap floors, + int unclaimed, + String[] claimed + ){} + public record Class(PlayerProfiles.PlayerProfile.Data.Level experience, boolean current){} +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java new file mode 100644 index 00000000..8f5a9790 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java @@ -0,0 +1,44 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons; + +import com.google.gson.annotations.SerializedName; + +public record Floor( + String name, + Stats stats, + @SerializedName("most_damage") MostDamage mostDamage, + Bonuses bonuses + +){ + public record Stats( + @SerializedName("times_played") int timesPlayed, + @SerializedName("best_score") int bestScore, + @SerializedName("mobs_killed") int mobsKilled, + @SerializedName("most_mobs_killed") int mostMobsKilled, + @SerializedName("most_healing") double mostHealing, + @SerializedName("tier_completions") int tierCompletions, + @SerializedName("fastest_time") long fastestTime, + @SerializedName("watcher_kills") int watcherKills, + @SerializedName("best_runs") Run[] bestRuns + ){} + public record MostDamage( + @SerializedName("class") String classUsed, + @SerializedName("value") double damage + ){} + public record Run( + long timestamp, + @SerializedName("score_exploration") int scoreExploration, + @SerializedName("score_speed") int scoreSpeed, + @SerializedName("score_skill") int scoreSkill, + @SerializedName("score_bonus") int scoreBonus, + @SerializedName("dungeon_class") int dungeonClass, + String[] teammates, + @SerializedName("elapsed_time") long elapsedTime, + @SerializedName("damaged_dealt") int damageDealt, + int deaths, + @SerializedName("mobs_killed") int mobsKilled, + @SerializedName("secrets_found") int secretsFound, + @SerializedName("damage_mitigated") double damageMitigated, + @SerializedName("ally_healing") int allyHealing + ){} + public record Bonuses(@SerializedName("item_boost") int itemBoost){} +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java new file mode 100644 index 00000000..a9553fd3 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java @@ -0,0 +1,18 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons; + +import com.google.gson.annotations.SerializedName; + +public record Journals( + @SerializedName("pages_completed") int pagesCompleted, + @SerializedName("journals_completed") int journalsCompleted, + @SerializedName("total_pages") Integer totalPages, + boolean maxed, + @SerializedName("journal_entries") Entry[] journalEntries + +){ + public record Entry( + String name, + @SerializedName("pages_collected") int pagesCollected, + @SerializedName("total_pages") Integer totalPages + ){} +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java new file mode 100644 index 00000000..305b9c35 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java @@ -0,0 +1,41 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.mining; + +import com.google.gson.annotations.SerializedName; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; + +import java.util.HashMap; + +public record Core( + PlayerProfiles.PlayerProfile.Data.Level tier, + Spent tokens, + @SerializedName("selected_pickaxe_ability") String selectedMiningAbility, + HashMap powder, + @SerializedName("crystal_nucleus") Nucleus crystalNucleus, + @SerializedName("daily_ores") DailyOres dailyOres, + @SerializedName("hotm_last_reset") long hotmLastReset, + @SerializedName("crystal_hollows_last_access") long crystalHollowsLastAccess +){ + public record Spent(int total, int spent, int available){} + public record Nucleus( + @SerializedName("times_completed") int timesCompleted, + HashMap crystals, + Goblin goblin + ){ + public record Crystal( + String state, + @SerializedName("total_placed") int totalPlaced, + @SerializedName("total_found") int totalFound + ){} + public record Goblin( + @SerializedName("king_quest_active") boolean kingQuestActive, + @SerializedName("king_quest_completed") boolean kingQuestCompleted + ){} + } + public record DailyOres( + int mined, + int day, + @SerializedName("daily_ores") HashMap dailyOres + ){ + public record Ore(int day, int count){} + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java new file mode 100644 index 00000000..d974f5c6 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java @@ -0,0 +1,23 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.mining; + +import com.google.gson.annotations.SerializedName; +import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; + +import java.util.HashMap; + +public record Mining( + Commissions commissions, + Forge forge, + Core core +){ + public record Forge(Process[] processes){ + public record Process( + String id, + int slot, + long timeFinished, + String timeFinishedText, + String name + ){} + } + public record Commissions(int milestone){} +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java new file mode 100644 index 00000000..2e3d55d7 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java @@ -0,0 +1,19 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.misc; + +import com.google.gson.annotations.SerializedName; + +public record Burrows( + @SerializedName("dug_next") Rarities dugNext, + @SerializedName("dug_combat") Rarities dugCombat, + @SerializedName("dug_treasure") Rarities dugTreasure, + @SerializedName("chains_complete") Rarities chainsComplete +){ + public record Rarities( + int total, + @SerializedName("null") int common, + int uncommon, + int rare, + int epic, + int legendary + ){} +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java new file mode 100644 index 00000000..f0bad737 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java @@ -0,0 +1,42 @@ +package me.xmrvizzy.skyblocker.skyblock.api.records.misc; + +import com.google.gson.annotations.SerializedName; + +public record Misc( + Milestones milestones, + Gifts gifts, + Winter winter, + Dragons dragons, + Protector protector, + Damage damage, + Burrows burrows, + ProfileUpgrades profileUpgrades +){ + public record Milestones( + @SerializedName("ores_mined") int oresMined, + @SerializedName("sea_creatures_killed") int seaCreaturesKilled + ){} + public record Gifts(@SerializedName("gifts_given") int giftsGiven){} + public record Winter( + @SerializedName("most_winter_snowballs_hit") int mostWinterSnowballsHit, + @SerializedName("most_winter_damage_dealt") int mostWinterDamageDealt, + @SerializedName("most_winter_magma_damage_dealt") int mostWinterMagmaDamageDealt + ){} + public record Dragons( + @SerializedName("ender_crystals_destroyed") int enderCrystalsDestroyed, + @SerializedName("last_hits") int lastHits, + @SerializedName("deaths") int deaths + ){} + public record Protector( + @SerializedName("last_hits") int lastHits, + int deaths + ){} + public record Damage(@SerializedName("highest_critical_damage") double highestCriticalDamage){} + public record ProfileUpgrades( + @SerializedName("island_size") int islandSize, + @SerializedName("minion_slots") int minionSlots, + @SerializedName("guest_count") int guestCount, + @SerializedName("coop_slots") int coopSlots, + @SerializedName("coins_allowance") int coinsAllowance + ){} +} -- cgit From 2401d49ae39293f8b4bd2b9606c6e626e8b1831e Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:40:28 -0500 Subject: Quick fix --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java index e6efc26c..7597a9ef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java @@ -6,7 +6,6 @@ import com.google.gson.JsonObject; import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemFixerUpper; -import net.minecraft.client.MinecraftClient; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.*; @@ -38,9 +37,9 @@ public class ProfileUtils { return null; } - public static List itemsFromApiInventory(PlayerProfiles.PlayerProfile.Items.Item[] items){ + public static List itemsFromApiInventory(me.xmrvizzy.skyblocker.skyblock.api.records.Items.Item[] items){ List inventory = new ArrayList<>(); - for (PlayerProfiles.PlayerProfile.Items.Item item : items){ + for (me.xmrvizzy.skyblocker.skyblock.api.records.Items.Item item : items){ try{ if (item.tag() != null){ JsonObject obj = new Gson().fromJson(Files.readString(Path.of("./config/skyblocker/items-repo/items/" + item.tag().extraAttributes().id() + ".json")), JsonObject.class); -- cgit From 53f04b828c5f924d9b394f1c6fba601ff566ccab Mon Sep 17 00:00:00 2001 From: Spencer <75862693+TacoMonkey11@users.noreply.github.com> Date: Sat, 5 Mar 2022 09:02:23 -0500 Subject: Change catch exceptions to be more generic --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java index 7597a9ef..6fbf740f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java @@ -31,7 +31,7 @@ public class ProfileUtils { .serializeNulls() .create(); return gson.fromJson(reader, PlayerProfiles.class); - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); } return null; @@ -101,7 +101,7 @@ public class ProfileUtils { } else { inventory.add(Items.AIR.getDefaultStack()); } - } catch (IOException e) { + } catch (Exception e) { e.printStackTrace(); } } -- cgit