Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions src/main/java/io/github/moulberry/repo/NEUConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@Getter
public class NEUConstants implements IReloadable {
Map<String, AbiphoneContact> abiphoneContacts;
Bonuses bonuses;
Parents parents;
Enchants enchants;
EssenceCosts essenceCost;
Expand All @@ -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<Map<String, AbiphoneContact>>() {});
bonuses = repository.requireFile("constants/bonuses.json").json(Bonuses.class);
parents = new Parents(repository.requireFile("constants/parents.json")
.json(new TypeToken<Map<String, List<String>>>() {
}));
Expand Down
54 changes: 0 additions & 54 deletions src/main/java/io/github/moulberry/repo/constants/Bonuses.java

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/java/io/github/moulberry/repo/constants/Misc.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -21,31 +20,17 @@ public class Misc {
*/
@SerializedName("slayer_cost")
List<String> slayerCost;
/**
* A map from {@code /locraw} mode name to a display name for that zone.
*/
@SerializedName("area_names")
Map<String, String> areaNames;

/**
* A map from API rank names to their respective renderers.
*/
Map<String, RankData> ranks;
/**
* A list of dash-less UUIDs of users with rainbow names in the profile viewer.
*/
@SerializedName("special_bois")
List<String> 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<String, Integer> 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).
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/moulberry/repo/data/NEUItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class NEUItem {
@SerializedName("internalname")
@NEUId String skyblockItemId;
String crafttext;
String clickcommand;
String modver;
String infoType;
List<String> info;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/moulberry/repo/data/Rarity.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ public enum Rarity {
LEGENDARY,
MYTHIC,
DIVINE,
SUPREME,
SPECIAL,
VERY_SPECIAL,
UNKNOWN

}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading