Merge pull request #836 from LongPPPP/master

feat: pet ability handler system remake

Author: Swofty-Developments

commons/src/generated/java/net/swofty/commons/skyblock/item/ItemType.java

@@ -262,7 +262,7 @@ public enum ItemType {
 
   BEE_MINION_SKIN(Material.PLAYER_HEAD, Rarity.COMMON),
 
-  BEE_PET(Material.PLAYER_HEAD, Rarity.EPIC),
+  BEE_PET(Material.PLAYER_HEAD, Rarity.MYTHIC),
 
   BEHEADED_HORROR(Material.PLAYER_HEAD, Rarity.EPIC),
 
@@ -722,6 +722,8 @@ public enum ItemType {
 
   CHICKEN_MINION(Material.PLAYER_HEAD, Rarity.COMMON),
 
+  CHICKEN_PET(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+
   CHILI_PEPPER(Material.PLAYER_HEAD, Rarity.UNCOMMON),
 
   CHISELED_QUARTZ_BLOCK(Material.CHISELED_QUARTZ_BLOCK, Rarity.COMMON),
@@ -1846,6 +1848,8 @@ public enum ItemType {
 
   GOLEM_SWORD(Material.IRON_SWORD, Rarity.RARE),
 
+  GRANDMA_WOLF_PET(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+
   GRANITE(Material.GRANITE, Rarity.COMMON),
 
   GRANITE_SLAB(Material.GRANITE_SLAB, Rarity.COMMON),

commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributePetData.java

@@ -67,6 +67,7 @@ public Integer getAsLevel(Rarity rarity) {
                 case RARE -> getLevel(experience, RARE_XP_GOALS);
                 case EPIC -> getLevel(experience, EPIC_XP_GOALS);
                 case LEGENDARY -> getLevel(experience, LEGENDARY_XP_GOALS);
+                case MYTHIC -> getLevel(experience, MYTHIC_XP_GOALS);
                 default -> 0;
             };
         }
@@ -78,6 +79,7 @@ public double getAsExperience(Rarity rarity) {
                 case RARE -> experience - RARE_XP_GOALS.get(getAsLevel(Rarity.RARE));
                 case EPIC -> experience - EPIC_XP_GOALS.get(getAsLevel(Rarity.EPIC));
                 case LEGENDARY -> experience - LEGENDARY_XP_GOALS.get(getAsLevel(Rarity.LEGENDARY));
+                case MYTHIC -> experience - MYTHIC_XP_GOALS.get(getAsLevel(Rarity.MYTHIC));
                 default -> 0;
             };
         }
@@ -89,6 +91,7 @@ public long getExperienceForLevel(int level, Rarity rarity) {
                 case RARE -> RARE_XP_GOALS.get(level - 1);
                 case EPIC -> EPIC_XP_GOALS.get(level - 1);
                 case LEGENDARY -> LEGENDARY_XP_GOALS.get(level - 1);
+                case MYTHIC -> MYTHIC_XP_GOALS.get(level - 1);
                 default -> 0;
             };
         }
@@ -136,4 +139,6 @@ private Integer getLevel(double xp, List<Integer> goals) {
             1205530, 1302730, 1406930, 1518630, 1638330, 1766530, 1903730, 2050430, 2207130, 2374830, 2554530, 2747230, 2953930, 3175630, 3413330, 3668030, 3940730, 4232430,
             4544130, 4877830, 5235530, 5619230, 6030930, 6472630, 6949330, 7466030, 8027730, 8639430, 9306130, 10032830, 10824530, 11686230, 12622930, 13639630, 14741330,
             15933030, 17219730, 18606430, 20103130, 21719830, 23466530, 25353230);
+
+    protected static final List<Integer> MYTHIC_XP_GOALS = LEGENDARY_XP_GOALS;
 }

commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java

@@ -169,6 +169,11 @@ public String getFullDisplayName() {
         return LegacyComponentSerializer.legacySection().serialize(getCompleteDisplayName());
     }
 
+    public String getLegacyDisplayColor() {
+        return LegacyComponentSerializer.legacySection()
+                .serialize(Component.text("|", displayColor)).replace("|", "");
+    }
+
     public Component getCompleteDisplayName() {
         return symbol.getSprite().appendSpace().append(Component.text(displayName)).color(displayColor);
     }

configuration/i18n/en_US/items.properties

@@ -434,6 +434,8 @@ items.EVERBURNING_FLAME = Everburning Flame
 items.HEAT_CORE = Heat Core
 items.BEE_MINION_SKIN = Bee Minion Skin
 items.BEE_PET = Bee Pet
+items.CHICKEN_PET = Chicken Pet
+items.GRANDMA_WOLF_PET = Grandma Wolf Pet
 items.ALL_SKILLS_EXP_BOOST = All Skills Exp Boost
 items.MINING_EXP_BOOST_COMMON = Mining Exp Boost Common
 items.MINING_EXP_BOOST_RARE = Mining Exp Boost Rare

configuration/skyblock/items/pets.yml

@@ -1,7 +1,7 @@
 items:
   - id: BEE_PET
     material: player_head
-    rarity: EPIC
+    rarity: MYTHIC
     components:
       - id: PET
         pet_name: Bee
@@ -35,31 +35,102 @@ items:
             item: ENCHANTED_GOLD_BLOCK
             amount: 9
           rest: null
-        base_statistics:
-          strength: 5.0
+        base_statistics: {}
         per_level_statistics:
           common:
-            speed: 1.0
-            strength: 3.0
-            intelligence: 5.0
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
           uncommon:
-            speed: 1.5
-            strength: 4.0
-            intelligence: 7.0
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
           rare:
-            speed: 2.0
-            strength: 5.0
-            intelligence: 10.0
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
+            mining_fortune: 0.2
+            foraging_fortune: 0.2
+            farming_fortune: 0.2
           epic:
-            speed: 2.5
-            strength: 6.0
-            intelligence: 15.0
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
+            mining_fortune: 0.25
+            foraging_fortune: 0.25
+            farming_fortune: 0.25
           legendary:
-            speed: 3.0
-            strength: 7.0
-            intelligence: 20.0
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
+            mining_fortune: 0.3
+            foraging_fortune: 0.3
+            farming_fortune: 0.3
+          mythic:
+            speed: 0.1
+            strength: 0.25
+            intelligence: 0.5
+            mining_fortune: 0.4
+            foraging_fortune: 0.4
+            farming_fortune: 0.4
         particle: 3
         skill_category: FARMING
         skull_texture: 12724a9a4cdd68ba49415560e5be40b4a1c47cb5be1d66aedb52a30e62ef2d47
         handler_id: BEE
+      - id: TRACKED_UNIQUE
+  - id: CHICKEN_PET
+    material: player_head
+    rarity: LEGENDARY
+    components:
+      - id: PET
+        pet_name: Chicken
+        base_statistics: {}
+        per_level_statistics:
+          common:
+            speed: 0.5
+            farming_fortune: 0.5
+          uncommon:
+            speed: 0.5
+            farming_fortune: 0.5
+          rare:
+            speed: 0.5
+            farming_fortune: 0.5
+          epic:
+            speed: 0.5
+            farming_fortune: 0.5
+          legendary:
+            speed: 0.5
+            farming_fortune: 0.5
+        particle: 3
+        skill_category: FARMING
+        skull_texture: 7f37d524c3eed171ce149887ea1dee4ed399904727d521865688ece3bac75e
+        handler_id: CHICKEN
+      - id: TRACKED_UNIQUE
+  - id: GRANDMA_WOLF_PET
+    material: player_head
+    rarity: LEGENDARY
+    components:
+      - id: PET
+        pet_name: Grandma Wolf
+        base_statistics: {}
+        per_level_statistics:
+          common:
+            strength: 0.25
+            health: 1
+          uncommon:
+            strength: 0.25
+            health: 1
+          rare:
+            strength: 0.25
+            health: 1
+          epic:
+            strength: 0.25
+            health: 1
+          legendary:
+            strength: 0.25
+            health: 1
+        particle: 3
+        skill_category: COMBAT
+        skull_texture: e897c5640ccfc68ffb65e331b7070ce5d14439ad2cd7d9612a6feb023eedac18
+        handler_id: GRANDMA_WOLF
       - id: TRACKED_UNIQUE

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/bestiary/BestiaryData.java

@@ -215,8 +215,8 @@ public int getTotalExtraXPPercentage(int tier) {
 
     public List<String> getTotalBonuses(List<String> lore, String name, int tier) {
         lore.add("§a" + name + " §aBonuses");
-        lore.add("§8+" + ItemStatistic.MAGIC_FIND.getDisplayColor() + getTotalMagicFind(tier) + " " + ItemStatistic.MAGIC_FIND.getFullDisplayName());
-        lore.add("§8+" + ItemStatistic.STRENGTH.getDisplayColor() + getTotalStrength(tier) + " " + ItemStatistic.STRENGTH.getFullDisplayName());
+        lore.add("§8+" + ItemStatistic.MAGIC_FIND.getLegacyDisplayColor() + getTotalMagicFind(tier) + " " + ItemStatistic.MAGIC_FIND.getFullDisplayName());
+        lore.add("§8+" + ItemStatistic.STRENGTH.getLegacyDisplayColor() + getTotalStrength(tier) + " " + ItemStatistic.STRENGTH.getFullDisplayName());
         lore.add("§8+§6" + getTotalExtraCoinPercentage(tier) + "% §7coin gain");
 
         int totalXp = getTotalExtraXPPercentage(tier);
@@ -231,8 +231,8 @@ public List<String> getTotalBonuses(List<String> lore, String name, int tier) {
 
     public List<String> getNextBonuses(List<String> lore, String name, int tier) {
         lore.add("§7Tier " + StringUtility.getAsRomanNumeral(tier) + " Rewards");
-        lore.add("  §8+" + ItemStatistic.MAGIC_FIND.getDisplayColor() + getMagicFind(tier) + " " + ItemStatistic.MAGIC_FIND.getFullDisplayName());
-        lore.add("  §8+" + ItemStatistic.STRENGTH.getDisplayColor() + getStrength(tier) + " " + ItemStatistic.STRENGTH.getFullDisplayName());
+        lore.add("  §8+" + ItemStatistic.MAGIC_FIND.getLegacyDisplayColor() + getMagicFind(tier) + " " + ItemStatistic.MAGIC_FIND.getFullDisplayName());
+        lore.add("  §8+" + ItemStatistic.STRENGTH.getLegacyDisplayColor() + getStrength(tier) + " " + ItemStatistic.STRENGTH.getFullDisplayName());
         lore.add("  §8+§6" + getExtraCoinPercentage(tier) + "% §7coin gain");
 
         int totalXp = getExtraXpPercentage(tier);

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/RecombobulateCommand.java

@@ -20,6 +20,10 @@ public void registerUsage(MinestomCommand command) {
 
             ((SkyBlockPlayer) sender).updateItem(PlayerItemOrigin.MAIN_HAND, (item) -> {
                 ItemAttributeHandler itemAttributeHandler = item.getAttributeHandler();
+                if (itemAttributeHandler.isPet()) {
+                    sender.sendMessage("§cPets cannot be recombobulated!");
+                    return;
+                }
                 itemAttributeHandler.setRecombobulated(!itemAttributeHandler.isRecombobulated());
                 sender.sendMessage("§aRecombobulated: §d" + itemAttributeHandler.isRecombobulated());
             });

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/commands/SetPetRarityCommand.java

@@ -0,0 +1,56 @@
+package net.swofty.type.skyblockgeneric.commands;
+
+import net.minestom.server.command.builder.arguments.ArgumentWord;
+import net.minestom.server.command.builder.suggestion.SuggestionEntry;
+import net.swofty.commons.skyblock.item.Rarity;
+import net.swofty.type.generic.command.CommandParameters;
+import net.swofty.type.generic.command.HypixelCommand;
+import net.swofty.type.generic.user.categories.Rank;
+import net.swofty.type.skyblockgeneric.item.ItemAttributeHandler;
+import net.swofty.type.skyblockgeneric.item.updater.PlayerItemOrigin;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@CommandParameters(labels = "setpetrarity",
+        description = "Sets the rarity of the pet in your hand",
+        usage = "/setpetrarity <rarity>",
+        permission = Rank.STAFF,
+        allowsConsole = false)
+public class SetPetRarityCommand extends HypixelCommand {
+    private static final List<Rarity> PET_RARITIES = Arrays.stream(Rarity.values())
+            .filter(rarity -> rarity.ordinal() <= Rarity.MYTHIC.ordinal())
+            .toList();
+
+    @Override
+    public void registerUsage(MinestomCommand command) {
+        ArgumentWord rarityArgument = new ArgumentWord("rarity");
+        rarityArgument.setSuggestionCallback((sender, context, suggestion) ->
+                PET_RARITIES.forEach(rarity ->
+                        suggestion.addEntry(new SuggestionEntry(rarity.name()))));
+
+        command.addSyntax((sender, context) -> {
+            if (!permissionCheck(sender)) return;
+
+            Rarity rarity = Rarity.getRarity(context.get(rarityArgument));
+            if (rarity == null || !PET_RARITIES.contains(rarity)) {
+                sender.sendMessage("§cInvalid rarity. Use " + PET_RARITIES.stream()
+                        .map(Enum::name).collect(Collectors.joining("/")) + ".");
+                return;
+            }
+            SkyBlockPlayer player = (SkyBlockPlayer) sender;
+
+            player.updateItem(PlayerItemOrigin.MAIN_HAND, (item) -> {
+                ItemAttributeHandler handler = item.getAttributeHandler();
+                if (!handler.isPet()) {
+                    sender.sendMessage("§cThe item in your hand is not a pet.");
+                    return;
+                }
+                handler.setRarity(rarity);
+                sender.sendMessage("§aSet rarity to " + rarity.getLegacyColor() + rarity.name() + "§a.");
+            });
+        }, rarityArgument);
+    }
+}

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointPetData.java

@@ -3,18 +3,26 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import net.swofty.commons.skyblock.item.ItemType;
+import net.swofty.commons.skyblock.item.Rarity;
 import net.swofty.commons.skyblock.item.UnderstandableSkyBlockItem;
 import net.swofty.commons.protocol.Serializer;
 import net.swofty.commons.protocol.serializers.UnderstandableSkyBlockItemSerializer;
 import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint;
 import net.swofty.type.skyblockgeneric.entity.PetEntityImpl;
 import net.swofty.type.skyblockgeneric.item.SkyBlockItem;
+import net.swofty.type.skyblockgeneric.item.components.PetComponent;
 import net.swofty.type.skyblockgeneric.item.components.SkullHeadComponent;
+import net.swofty.type.skyblockgeneric.item.handlers.pet.PetHandler;
+import net.swofty.type.skyblockgeneric.item.handlers.pet.abstr.AbilityRuntime;
+import net.swofty.type.skyblockgeneric.item.handlers.pet.abstr.PetAbility;
+import net.swofty.type.skyblockgeneric.item.handlers.pet.abstr.PetEvent;
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class DatapointPetData extends SkyBlockDatapoint<DatapointPetData.UserPetData> {
     private static final Serializer serializer = new Serializer<UserPetData>() {
@@ -64,6 +72,8 @@ public DatapointPetData(String key) {
     public static class UserPetData {
         private HashMap<SkyBlockItem, Boolean> petsMap;
         private PetEntityImpl enabledPetEntityImpl = null;
+        private transient List<PetAbility> cachedAbilities;
+        private final transient Map<PetAbility, AbilityRuntime> abilityRuntimes = new HashMap<>();
 
         public UserPetData() {
             this.petsMap = new HashMap<>();
@@ -79,13 +89,15 @@ public void addPet(SkyBlockItem pet) {
 
         public void setEnabled(ItemType type, boolean enabled) {
             // Set all previous true pets to false
-            petsMap.keySet().stream().filter(pet -> pet.getAttributeHandler().getPotentialType() == type).forEach(pet -> petsMap.put(pet, false));
+            petsMap.keySet().forEach(pet -> petsMap.put(pet, false));
 
             // Set the new pet to the new state
             petsMap.keySet().stream().filter(pet -> pet.getAttributeHandler().getPotentialType() == type).findFirst().ifPresent(pet -> petsMap.put(pet, enabled));
 
             if (enabledPetEntityImpl != null)
                 enabledPetEntityImpl.remove();
+
+            refreshCachedAbilities();
         }
 
         public void updatePetEntityImpl(SkyBlockPlayer player) {
@@ -108,12 +120,45 @@ public void isEnabled(ItemType type) {
 
         public void deselectCurrent() {
             petsMap.keySet().forEach(pet -> petsMap.put(pet, false));
+            this.cachedAbilities = null;
         }
 
         public @Nullable SkyBlockItem getEnabledPet() {
             return petsMap.keySet().stream().filter(petsMap::get).findFirst().orElse(null);
         }
 
+        public List<PetAbility> getCachedAbilities(SkyBlockItem pet) {
+            if (cachedAbilities == null) {
+                PetComponent component = pet.getComponent(PetComponent.class);
+                cachedAbilities = PetHandler.valueOf(component.getHandlerId().toUpperCase()).getAbilities(pet);
+            }
+            return cachedAbilities;
+        }
+
+        public AbilityRuntime getAbilityRuntime(PetAbility ability) {
+            return abilityRuntimes.computeIfAbsent(ability, _ -> new AbilityRuntime());
+        }
+
+        public <E extends PetEvent> E dispatch(E event) {
+            SkyBlockItem pet = getEnabledPet();
+            if (pet == null) return event;
+            for (PetAbility ability : getCachedAbilities(pet)) {
+                ability.onEvent(event);
+            }
+            return event;
+        }
+
+        // TODO: need to be called by Tier Boost
+        public void refreshCachedAbilities() {
+            SkyBlockItem activePet = getEnabledPet();
+            if (activePet != null) {
+                PetComponent component = activePet.getComponent(PetComponent.class);
+                this.cachedAbilities = PetHandler.valueOf(component.getHandlerId().toUpperCase()).getAbilities(activePet);
+            } else {
+                this.cachedAbilities = null;
+            }
+        }
+
         public @Nullable SkyBlockItem getPet(ItemType type) {
             return petsMap.keySet().stream().filter(pet -> pet.getAttributeHandler().getPotentialType() == type).findFirst().orElse(null);
         }