Merge pull request #491 from FreakyFreakyNerd/master

Implemented fuming potato books and support for dungeon item rarity type.

Author: Swofty-Developments

commons/src/main/java/net/swofty/commons/item/ItemType.java

@@ -472,6 +472,7 @@ public enum ItemType {
     NECRONS_HANDLE(Material.STICK,  Rarity.EPIC),
     BIGFOOT_LASSO(Material.LEAD, Rarity.EPIC),
     BONZO_FRAGMENT(Material.RED_MUSHROOM, Rarity.RARE),
+    FUMING_POTATO_BOOK(Material.BOOK,  Rarity.EPIC),
 
     /**
      * Mythological Ritual

commons/src/main/java/net/swofty/commons/item/PotatoType.java

@@ -10,11 +10,9 @@
 @Getter
 public enum PotatoType {
     ARMOR(List.of("§7When applied to armor, grants §a+2" + ItemStatistic.DEFENSE.getSymbol(),
-            "§aDefense §7and §c+4" + ItemStatistic.HEALTH.getSymbol() + " Health§7.",
-            " "), Map.of(ItemStatistic.DEFENSE, 2.0, ItemStatistic.HEALTH, 4.0)),
+            "§aDefense §7and §c+4" + ItemStatistic.HEALTH.getSymbol() + " Health§7."), Map.of(ItemStatistic.DEFENSE, 2.0, ItemStatistic.HEALTH, 4.0)),
     WEAPONS(List.of("§7When applied to weapons, grants",
-            "§c+2" + ItemStatistic.STRENGTH.getSymbol() + " Strength §7and §c+2" + ItemStatistic.DAMAGE.getSymbol() + " Damage§7.",
-            " "), Map.of(ItemStatistic.STRENGTH, 2.0, ItemStatistic.DAMAGE, 2.0)),
+            "§c+2" + ItemStatistic.STRENGTH.getSymbol() + " Strength §7and §c+2" + ItemStatistic.DAMAGE.getSymbol() + " Damage§7."), Map.of(ItemStatistic.STRENGTH, 2.0, ItemStatistic.DAMAGE, 2.0)),
     ;
 
     public List<String> display;
@@ -27,6 +25,7 @@ public enum PotatoType {
 
     public static List<String> allLores() {
         List<String> lores = new ArrayList<>(ARMOR.display);
+        lores.add("");
         lores.addAll(WEAPONS.display);
         return lores;
     }

commons/src/main/java/net/swofty/commons/item/attribute/attributes/ItemAttributeHotPotatoBookData.java

@@ -4,11 +4,19 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.swofty.commons.item.ItemType;
 import net.swofty.commons.item.PotatoType;
 import net.swofty.commons.item.attribute.ItemAttribute;
 import net.swofty.commons.statistics.ItemStatistics;
 import org.jetbrains.annotations.Nullable;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.IntStream;
+
 public class ItemAttributeHotPotatoBookData extends ItemAttribute<ItemAttributeHotPotatoBookData.HotPotatoBookData> {
 
     @Override
@@ -24,35 +32,51 @@ public HotPotatoBookData getDefaultValue(@Nullable ItemStatistics defaultStatist
     @Override
     public HotPotatoBookData loadFromString(String string) {
         HotPotatoBookData hotPotatoBookData = new HotPotatoBookData();
-        String[] split = string.split(",");
-        for (String s : split) {
-            String[] split1 = s.split(":");
-            switch (split1[0]) {
-                case "potatoType":
-                    if (!split1[1].equals("null")) {
-                        hotPotatoBookData.setPotatoType(PotatoType.valueOf(split1[1]));
-                    } else {
-                        hotPotatoBookData.setPotatoType(null);
-                    }
-                    break;
-                case "amount":
-                    hotPotatoBookData.setAmount(Integer.parseInt(split1[1]));
-                    break;
+
+        JSONObject obj = new JSONObject(string);
+
+        PotatoType potatoType = null;
+        if (obj.has("potatoType")){
+            potatoType = obj.getEnum(PotatoType.class, "potatoType");
+        }
+
+        hotPotatoBookData.setPotatoType(potatoType);
+
+        if (obj.has("applied")) {
+            var list = obj.getJSONArray("applied");
+
+            HashMap<ItemType, Integer> applied = new HashMap<>();
+            for (int i = 0; i < list.length(); i++) {
+                var value = list.getString(i);
+
+                var split = value.split(":");
+                applied.put(ItemType.valueOf(split[0]), Integer.parseInt(split[1]));
             }
+
+            hotPotatoBookData.setAppliedItems(applied);
         }
+
         return hotPotatoBookData;
     }
 
     @Override
     public String saveIntoString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        if (getValue().hasPotatoBook()) {
-            stringBuilder.append("potatoType:").append(getValue().getPotatoType()).append(",");
+        JSONObject obj = new JSONObject();
+
+        if (getValue().hasAppliedItem()) {
+            obj.put("potatoType", getValue().getPotatoType());
         } else {
-            stringBuilder.append("potatoType:null,");
+            obj.putOnce("potatoType", null);
         }
-        stringBuilder.append("amount:").append(getValue().getAmount());
-        return stringBuilder.toString();
+
+        JSONArray array = new JSONArray();
+
+        for (Map.Entry<ItemType, Integer> appliedItem : getValue().getAppliedItems().entrySet()) {
+                array.put(appliedItem.getKey() + ":" + appliedItem.getValue());
+            }
+
+        obj.put("applied", array);
+        return obj.toString();
     }
 
     @AllArgsConstructor
@@ -61,14 +85,26 @@ public String saveIntoString() {
     @Setter
     public static class HotPotatoBookData {
         private PotatoType potatoType = null;
-        private int amount = 0;
+        private HashMap<ItemType, Integer> appliedItems = new HashMap<>();
+
+        public void addAmount(ItemType itemType, int amount) {
+            if (!appliedItems.containsKey(itemType)){
+                appliedItems.put(itemType, amount);
+            }else{
+                appliedItems.put(itemType, appliedItems.get(itemType) + amount);
+            }
+        }
+
+        public int getAmount(ItemType type){
+            return appliedItems.getOrDefault(type, 0);
+        }
 
-        public void addAmount(int amount) {
-            this.amount += amount;
+        public boolean hasAppliedItem(ItemType itemType){
+            return appliedItems.containsKey(itemType) && appliedItems.get(itemType) > 0;
         }
 
-        public boolean hasPotatoBook() {
-            return amount > 0;
+        public boolean hasAppliedItem(){
+            return appliedItems.values().stream().mapToInt(Integer::intValue).sum() > 0;
         }
     }
 }

configuration/items/enchantment.yml

@@ -9,6 +9,7 @@ items:
       - id: TRACKED_UNIQUE
       - id: ENCHANTED
   - id: HOT_POTATO_BOOK
+    rarity: EPIC
     lore:
       - "§7This item can be applied to an item up to"
       - "§a10 §7times!"
@@ -21,4 +22,19 @@ items:
       - id: SELLABLE
         value: 38400
       - id: TRACKED_UNIQUE
-      - id: ENCHANTED
+      - id: ENCHANTED
+  - id: FUMING_POTATO_BOOK
+    rarity: EPIC
+    lore:
+      - "§7This book bypasses the §5 Hot Potato"
+      - "§5Book §7 limit of §a10§7, allowing you to"
+      - "§7upgrade an item up to §a15§7 times!"
+    components:
+      - id: ANVIL_COMBINABLE
+        handler_id: HOT_POTATO_BOOK
+      - id: LORE_UPDATE
+        is_absolute: false
+        handler_id: HOT_POTATO_BOOK
+      - id: TRACKED_UNIQUE
+      - id: ENCHANTED
+      - id: DUNGEON_ITEM

type.generic/src/main/java/net/swofty/types/generic/item/ItemConfigParser.java

@@ -38,6 +38,7 @@ public static ConfigurableSkyBlockItem parseItem(Map<String, Object> config) {
 
         List<String> lore = (List<String>) config.get("lore");
         Map<String, Double> statistics = new HashMap<>();
+
         if (config.containsKey("default_statistics")) {
             // Convert all the objects to doubles, noting they may be integers
             for (Map.Entry<String, Object> entry : ((Map<String, Object>) config.get("default_statistics")).entrySet()) {
@@ -137,6 +138,9 @@ yield new EnchantableComponent(
                 String display = (String) config.get("display");
                 yield new ExtraRarityComponent(display);
             }
+            case "DUNGEON_ITEM" -> {
+                yield new ExtraRarityComponent("DUNGEON ITEM");
+            }
             case "EXTRA_UNDER_NAME" -> {
                 if (config.containsKey("displays")) {
                     List<String> displays = (List<String>) config.get("displays");
@@ -158,6 +162,23 @@ yield new EnchantableComponent(
             }
             case "HOT_POTATO" -> {
                 String type = (String) config.get("potato_type");
+
+                if (config.containsKey("appliable_items")) {
+                    var appliableItems = (List<String>) config.get("appliable_items");
+                    HashMap<ItemType, Integer> appliable = new HashMap<>();
+
+                    for (var item : appliableItems) {
+                        var split = item.split(":");
+
+                        if (split.length != 2)
+                            continue;
+
+                        appliable.put(ItemType.valueOf(split[0]), Integer.parseInt(split[1]));
+                    }
+
+                    yield new HotPotatoableComponent(PotatoType.valueOf(type), appliable);
+                }
+
                 yield new HotPotatoableComponent(PotatoType.valueOf(type));
             }
             case "INTERACTABLE" -> {

type.generic/src/main/java/net/swofty/types/generic/item/ItemLore.java

@@ -301,7 +301,7 @@ private boolean addPossiblePropertyInt(ItemStatistic statistic, double overallVa
 
         double hpbValue = 0;
         ItemAttributeHotPotatoBookData.HotPotatoBookData hotPotatoBookData = item.getAttributeHandler().getHotPotatoBookData();
-        if (hotPotatoBookData.hasPotatoBook()) {
+        if (hotPotatoBookData.hasAppliedItem()) {
             for (Map.Entry<ItemStatistic, Double> entry : hotPotatoBookData.getPotatoType().stats.entrySet()) {
                 ItemStatistic stat = entry.getKey();
                 Double value = entry.getValue();

type.generic/src/main/java/net/swofty/types/generic/item/components/HotPotatoableComponent.java

@@ -1,14 +1,35 @@
 package net.swofty.types.generic.item.components;
 
 import lombok.Getter;
+import net.swofty.commons.item.ItemType;
 import net.swofty.commons.item.PotatoType;
 import net.swofty.types.generic.item.SkyBlockItemComponent;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Getter
 public class HotPotatoableComponent extends SkyBlockItemComponent {
     private final PotatoType potatoType;
 
+    private final Map<ItemType, Integer> applicableItems;
+
     public HotPotatoableComponent(PotatoType type) {
         this.potatoType = type;
+
+        applicableItems = Map.of(ItemType.HOT_POTATO_BOOK, 10, ItemType.FUMING_POTATO_BOOK, 5);// new ApplicableItem[]{new ApplicableItem(ItemType.HOT_POTATO_BOOK, 10), new ApplicableItem(ItemType.FUMING_POTATO_BOOK, 5)};
+    }
+
+    public HotPotatoableComponent(PotatoType type, Map<ItemType, Integer> applicableItems){
+        this.potatoType = type;
+        this.applicableItems = applicableItems;
+    }
+
+    public boolean canApply(ItemType type){
+        return applicableItems.containsKey(type);
+    }
+
+    public int getMax(ItemType type){
+        return applicableItems.getOrDefault(type, 0);
     }
 }

type.generic/src/main/java/net/swofty/types/generic/item/handlers/anvilcombine/AnvilCombineRegistry.java

@@ -24,16 +24,22 @@ public class AnvilCombineRegistry {
                     HotPotatoableComponent hotPotatoable = upgradeItem.getComponent(HotPotatoableComponent.class);
                     PotatoType potatoType = hotPotatoable.getPotatoType();
 
+                    var type = sacrificeItem.getAttributeHandler().getPotentialType();
+
                     ItemAttributeHotPotatoBookData.HotPotatoBookData upgradeData = upgradeItem.getAttributeHandler().getHotPotatoBookData();
-                    upgradeData.addAmount(1);
+                    upgradeData.addAmount(type, 1);
                     upgradeData.setPotatoType(potatoType);
                     upgradeItem.getAttributeHandler().setHotPotatoBookData(upgradeData);
                 },
                 (player, upgradeItem, sacrificeItem) -> {
                     if (upgradeItem.hasComponent(HotPotatoableComponent.class)) {
+                        System.out.println(upgradeItem.getAttributeHandler().getPotentialType());
+
+                        var type = sacrificeItem.getAttributeHandler().getPotentialType();
+
                         HotPotatoableComponent hotPotatoable = upgradeItem.getComponent(HotPotatoableComponent.class);
                         ItemAttributeHotPotatoBookData.HotPotatoBookData upgradeData = upgradeItem.getAttributeHandler().getHotPotatoBookData();
-                        return upgradeData.getAmount() < 10;
+                        return hotPotatoable.canApply(type) && upgradeData.getAmount(type) < hotPotatoable.getMax(type);
                     }
                     return false;
                 },

type.generic/src/main/java/net/swofty/types/generic/item/handlers/lore/LoreRegistry.java

@@ -70,11 +70,7 @@ public class LoreRegistry {
                 "§eClick to open!"
         ), (item, player) -> "§aSkyBlock Menu §7(Click)"));
         register("HOT_POTATO_BOOK", new LoreConfig((item, player) -> {
-            List<String> lore = PotatoType.allLores();
-            lore.add("§7This item can be applied to an item up to");
-            lore.add("§a10 §7times!");
-
-            return lore;
+            return PotatoType.allLores();
         }, null));
     }
 

type.generic/src/main/java/net/swofty/types/generic/user/statistics/PlayerStatistics.java

@@ -283,7 +283,7 @@ private ItemStatistics getReforgeStatistics(SkyBlockItem item, ItemStatistics st
 
     private ItemStatistics getHotPotatoBookStatistics(SkyBlockItem item, ItemStatistics statistics) {
         ItemAttributeHotPotatoBookData.HotPotatoBookData hotPotatoBookData = item.getAttributeHandler().getHotPotatoBookData();
-        if (hotPotatoBookData.hasPotatoBook()) {
+        if (hotPotatoBookData.hasAppliedItem()) {
             ItemStatistics.Builder toAdd = ItemStatistics.builder();
             PotatoType potatoType = hotPotatoBookData.getPotatoType();