From aa4f3f798a5c34676932b0ac4e47830706f3dfc5 Mon Sep 17 00:00:00 2001 From: alex <8379108+Alex33856@users.noreply.github.com> Date: Fri, 30 Oct 2026 19:12:33 -0400 Subject: [PATCH] feat: remove deprecated fields --- .../github/moulberry/repo/NEUConstants.java | 2 - .../moulberry/repo/constants/Bonuses.java | 54 ------------------- .../github/moulberry/repo/constants/Misc.java | 15 ------ .../github/moulberry/repo/data/NEUItem.java | 1 - .../io/github/moulberry/repo/data/Rarity.java | 2 - .../moulberry/repo/NEURepoParserTest.java | 6 +-- 6 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 src/main/java/io/github/moulberry/repo/constants/Bonuses.java diff --git a/src/main/java/io/github/moulberry/repo/NEUConstants.java b/src/main/java/io/github/moulberry/repo/NEUConstants.java index e6ab4ef..8b4afc1 100644 --- a/src/main/java/io/github/moulberry/repo/NEUConstants.java +++ b/src/main/java/io/github/moulberry/repo/NEUConstants.java @@ -16,7 +16,6 @@ @Getter public class NEUConstants implements IReloadable { Map abiphoneContacts; - Bonuses bonuses; Parents parents; Enchants enchants; EssenceCosts essenceCost; @@ -31,7 +30,6 @@ public class NEUConstants implements IReloadable { public void reload(NEURepository repository) throws NEURepositoryException { abiphoneContacts = repository.requireFile("constants/abiphone.json").json(new TypeToken>() {}); - bonuses = repository.requireFile("constants/bonuses.json").json(Bonuses.class); parents = new Parents(repository.requireFile("constants/parents.json") .json(new TypeToken>>() { })); diff --git a/src/main/java/io/github/moulberry/repo/constants/Bonuses.java b/src/main/java/io/github/moulberry/repo/constants/Bonuses.java deleted file mode 100644 index b196890..0000000 --- a/src/main/java/io/github/moulberry/repo/constants/Bonuses.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.github.moulberry.repo.constants; - -import com.google.gson.annotations.SerializedName; -import io.github.moulberry.repo.data.Rarity; -import lombok.Getter; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; - -public class Bonuses { - - @Getter - @SerializedName("pet_rewards") - Map> petRewards; - @Getter - @SerializedName("pet_value") - Map petValue; - @Getter - @SerializedName("bonus_stats") - Map>> bonusStats; - - public int getPetValue(Rarity rarity) { - if (petValue == null) return 0; - return petValue.getOrDefault(rarity, 0); - } - - public Map getPetRewards(int score) { - if (petRewards == null) return new HashMap<>(); - return petRewards.entrySet().stream() - .sorted(Comparator.comparingInt(Map.Entry::getKey)) - .filter(it -> it.getKey() <= score) - .map(Map.Entry::getValue) - .reduce(new HashMap<>(), (a, b) -> { - a.putAll(b); - return a; - }); - } - - public Map getAccumulativeLevelingRewards(String name, int level) { - if (bonusStats == null) return new HashMap<>(); - Map> rewardTiers = bonusStats.getOrDefault(name, new HashMap<>()); - Map rewards = new HashMap<>(); - Map currentBonuses = new HashMap<>(); - for (int i = 0; i <= level; i++) { - currentBonuses = rewardTiers.getOrDefault(i, currentBonuses); - for (Map.Entry reward : currentBonuses.entrySet()) { - rewards.put(reward.getKey(), rewards.getOrDefault(reward.getKey(), 0F) + reward.getValue()); - } - } - return rewards; - } - -} diff --git a/src/main/java/io/github/moulberry/repo/constants/Misc.java b/src/main/java/io/github/moulberry/repo/constants/Misc.java index cfd3f80..db3d7c4 100644 --- a/src/main/java/io/github/moulberry/repo/constants/Misc.java +++ b/src/main/java/io/github/moulberry/repo/constants/Misc.java @@ -1,7 +1,6 @@ package io.github.moulberry.repo.constants; import com.google.gson.annotations.SerializedName; -import io.github.moulberry.repo.data.NEUItem; import lombok.Getter; import java.util.List; @@ -21,31 +20,17 @@ public class Misc { */ @SerializedName("slayer_cost") List slayerCost; - /** - * A map from {@code /locraw} mode name to a display name for that zone. - */ - @SerializedName("area_names") - Map areaNames; /** * A map from API rank names to their respective renderers. */ Map ranks; - /** - * A list of dash-less UUIDs of users with rainbow names in the profile viewer. - */ - @SerializedName("special_bois") - List rainbowNames; /** * A map from minion name without the {@code _TIER} postfix (e.g. {@code ACACIA_GENERATOR}) to the maximum level * for that minion. */ @SerializedName("minions") Map maxMinionLevel; - /** - * The credit item for the NEU mod. - */ - NEUItem credits; /** * A list of talismans along with their upgrades. This list is not transitive (or rather talisman upgrades are * transitive, but this list has already resolved these transitive upgrades). diff --git a/src/main/java/io/github/moulberry/repo/data/NEUItem.java b/src/main/java/io/github/moulberry/repo/data/NEUItem.java index a25f1fc..616651c 100644 --- a/src/main/java/io/github/moulberry/repo/data/NEUItem.java +++ b/src/main/java/io/github/moulberry/repo/data/NEUItem.java @@ -20,7 +20,6 @@ public class NEUItem { @SerializedName("internalname") @NEUId String skyblockItemId; String crafttext; - String clickcommand; String modver; String infoType; List info; diff --git a/src/main/java/io/github/moulberry/repo/data/Rarity.java b/src/main/java/io/github/moulberry/repo/data/Rarity.java index 0dfb365..47d7e3e 100644 --- a/src/main/java/io/github/moulberry/repo/data/Rarity.java +++ b/src/main/java/io/github/moulberry/repo/data/Rarity.java @@ -9,9 +9,7 @@ public enum Rarity { LEGENDARY, MYTHIC, DIVINE, - SUPREME, SPECIAL, VERY_SPECIAL, UNKNOWN - } diff --git a/src/test/java/io/github/moulberry/repo/NEURepoParserTest.java b/src/test/java/io/github/moulberry/repo/NEURepoParserTest.java index 324cff8..32c1b4b 100644 --- a/src/test/java/io/github/moulberry/repo/NEURepoParserTest.java +++ b/src/test/java/io/github/moulberry/repo/NEURepoParserTest.java @@ -64,19 +64,15 @@ void testLevelingConstants() { @Test void testMiscConstants() { - Assertions.assertEquals(210, repository.getConstants().getMisc().getRainbowNames().size()); - Assertions.assertEquals("Private Island", repository.getConstants().getMisc().getAreaNames().get("dynamic")); Assertions.assertEquals(12, repository.getConstants().getMisc().getMaxMinionLevel().get("BLAZE_GENERATOR")); Assertions.assertEquals("100000", repository.getConstants().getMisc().getSlayerCost().get(4)); Assertions.assertEquals("MVP", repository.getConstants().getMisc().getRanks().get("SUPERSTAR").getTag()); Assertions.assertEquals("[CANDY_RING, CANDY_ARTIFACT, CANDY_RELIC]", repository.getConstants().getMisc().getTalismanUpgrades().get("CANDY_TALISMAN").toString()); - Assertions.assertEquals(31, repository.getConstants().getMisc().getCredits().getLore().size()); } @Test void testConstants() { - Assertions.assertEquals("{magic_find=5.0}", repository.getConstants().getBonuses().getPetRewards(115).toString()); - Assertions.assertEquals("{damage_increase=2.0999992, crit_chance=30.0}", repository.getConstants().getBonuses().getAccumulativeLevelingRewards("skill_combat", 60).toString()); + Assertions.assertEquals("Private Island", repository.getConstants().getIslands().getAreaNames().get("dynamic")); Assertions.assertEquals("Optional[PERFECT_AMETHYST_GEM]", repository.getConstants().getParents().getParent("FLAWED_AMETHYST_GEM").toString()); Assertions.assertEquals("[bane_of_arthropods, cleave, critical, cubism, dragon_hunter, ender_slayer, execute, experience, fire_aspect, first_strike, giant_killer, impaling, knockback, lethality, life_steal, looting, luck, mana_steal, PROSECUTE, scavenger, sharpness, smite, syphon, titan_killer, thunderlord, thunderbolt, triple_strike, vampirism, venomous, vicious, ultimate_one_for_all, ultimate_soul_eater, ultimate_chimera, ultimate_combo, ultimate_swarm, ultimate_wise, smoldering, ultimate_inferno, ultimate_fatal_tempo, tabasco, champion, divine_gift, magmarizer]", repository.getConstants().getEnchants().getAvailableEnchants("SWORD").toString()); Assertions.assertEquals("[ultimate_one_for_all]", repository.getConstants().getEnchants().getConflictingEnchants("sharpness").toString());