From 81fd805d7ae6245656957a18f012583a6b6cf6c4 Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sat, 3 Jan 2026 21:44:45 +0100 Subject: [PATCH 1/3] More talismans! --- .../commons/skyblock/item/ItemType.java | 243 ++++++++++- .../attributes/ItemAttributeGemData.java | 1 + .../skyblock/items/accessories/abicases.yml | 7 + .../items/accessories/accessories.yml | 40 +- .../skyblock/items/accessories/agarimoo.yml | 42 ++ .../skyblock/items/accessories/anguish.yml | 48 +++ .../skyblock/items/accessories/anita.yml | 33 ++ .../skyblock/items/accessories/bat.yml | 45 ++ .../skyblock/items/accessories/batperson.yml | 32 ++ .../items/accessories/bestmastercrest.yml | 54 +++ .../skyblock/items/accessories/bingo.yml | 44 ++ .../items/accessories/bioanalysis.yml | 39 ++ .../skyblock/items/accessories/blooddonor.yml | 51 +++ .../items/accessories/burststopper.yml | 28 ++ .../skyblock/items/accessories/campfire.yml | 382 +++++++++++++++++ .../skyblock/items/accessories/candy.yml | 33 ++ .../skyblock/items/accessories/cat.yml | 51 +++ .../skyblock/items/accessories/century.yml | 26 ++ .../skyblock/items/accessories/chocolate.yml | 65 +++ .../skyblock/items/accessories/coin.yml | 45 ++ .../skyblock/items/accessories/draconic.yml | 39 ++ .../skyblock/items/accessories/dungeon.yml | 1 + .../skyblock/items/accessories/emerald.yml | 26 ++ .../skyblock/items/accessories/emperor.yml | 39 ++ .../skyblock/items/accessories/ender.yml | 22 + .../skyblock/items/accessories/feather.yml | 38 ++ .../skyblock/items/accessories/fishbowl.yml | 39 ++ .../items/accessories/frozenchicken.yml | 36 ++ .../skyblock/items/accessories/garden.yml | 67 +++ .../skyblock/items/accessories/gift.yml | 55 +++ .../skyblock/items/accessories/glacial.yml | 33 ++ .../skyblock/items/accessories/greatspook.yml | 39 ++ .../skyblock/items/accessories/haste.yml | 28 ++ .../skyblock/items/accessories/healing.yml | 29 ++ .../skyblock/items/accessories/hunter.yml | 26 ++ .../items/accessories/intimidation.yml | 45 ++ .../skyblock/items/accessories/jerry.yml | 52 +++ .../skyblock/items/accessories/junk.yml | 39 ++ .../skyblock/items/accessories/kuudracore.yml | 39 ++ .../skyblock/items/accessories/lush.yml | 40 ++ .../items/accessories/masterskull.yml | 75 ++++ .../skyblock/items/accessories/mineral.yml | 26 ++ .../skyblock/items/accessories/moonglade.yml | 48 +++ .../skyblock/items/accessories/odger.yml | 68 +++ .../items/accessories/personalcompactor.yml | 40 ++ .../items/accessories/personaldeletor.yml | 36 ++ .../skyblock/items/accessories/pesthunter.yml | 52 +++ .../skyblock/items/accessories/piggy.yml | 39 ++ .../skyblock/items/accessories/potion.yml | 38 ++ .../skyblock/items/accessories/power.yml | 101 +++++ .../skyblock/items/accessories/pressure.yml | 45 ++ .../skyblock/items/accessories/redclaw.yml | 39 ++ .../items/accessories/respiration.yml | 45 ++ .../skyblock/items/accessories/runeblade.yml | 39 ++ .../skyblock/items/accessories/scarfs.yml | 14 +- .../skyblock/items/accessories/scavenger.yml | 34 ++ .../items/accessories/seacreatures.yml | 44 ++ .../skyblock/items/accessories/seal.yml | 30 ++ .../skyblock/items/accessories/shark.yml | 64 +++ .../items/accessories/soulcampfire.yml | 392 ++++++++++++++++++ .../skyblock/items/accessories/soulflow.yml | 35 ++ .../skyblock/items/accessories/speed.yml | 14 +- .../skyblock/items/accessories/spider.yml | 14 +- .../skyblock/items/accessories/titanium.yml | 60 +++ .../skyblock/items/accessories/treasure.yml | 14 +- .../skyblock/items/accessories/vaccine.yml | 38 ++ .../skyblock/items/accessories/wither.yml | 26 ++ .../skyblock/items/accessories/wolf.yml | 25 ++ .../skyblock/items/accessories/zombie.yml | 14 +- .../dwarvenmines/gui/GUIGemstoneGrinder.java | 1 - .../dwarvenmines/gui/GUIGemstoneGuide.java | 1 - .../datapoints/DatapointAccessoryBag.java | 36 +- .../sbmenu/bags/GUIAccessoryBag.java | 3 +- .../item/ItemConfigParser.java | 6 - .../item/TieredTalismansRegistry.java | 104 +++++ .../components/TieredTalismanComponent.java | 15 - 76 files changed, 3598 insertions(+), 118 deletions(-) create mode 100644 configuration/skyblock/items/accessories/agarimoo.yml create mode 100644 configuration/skyblock/items/accessories/anguish.yml create mode 100644 configuration/skyblock/items/accessories/anita.yml create mode 100644 configuration/skyblock/items/accessories/bat.yml create mode 100644 configuration/skyblock/items/accessories/batperson.yml create mode 100644 configuration/skyblock/items/accessories/bestmastercrest.yml create mode 100644 configuration/skyblock/items/accessories/bingo.yml create mode 100644 configuration/skyblock/items/accessories/bioanalysis.yml create mode 100644 configuration/skyblock/items/accessories/blooddonor.yml create mode 100644 configuration/skyblock/items/accessories/burststopper.yml create mode 100644 configuration/skyblock/items/accessories/candy.yml create mode 100644 configuration/skyblock/items/accessories/cat.yml create mode 100644 configuration/skyblock/items/accessories/century.yml create mode 100644 configuration/skyblock/items/accessories/chocolate.yml create mode 100644 configuration/skyblock/items/accessories/coin.yml create mode 100644 configuration/skyblock/items/accessories/draconic.yml create mode 100644 configuration/skyblock/items/accessories/emerald.yml create mode 100644 configuration/skyblock/items/accessories/emperor.yml create mode 100644 configuration/skyblock/items/accessories/ender.yml create mode 100644 configuration/skyblock/items/accessories/feather.yml create mode 100644 configuration/skyblock/items/accessories/fishbowl.yml create mode 100644 configuration/skyblock/items/accessories/frozenchicken.yml create mode 100644 configuration/skyblock/items/accessories/garden.yml create mode 100644 configuration/skyblock/items/accessories/gift.yml create mode 100644 configuration/skyblock/items/accessories/glacial.yml create mode 100644 configuration/skyblock/items/accessories/greatspook.yml create mode 100644 configuration/skyblock/items/accessories/haste.yml create mode 100644 configuration/skyblock/items/accessories/healing.yml create mode 100644 configuration/skyblock/items/accessories/hunter.yml create mode 100644 configuration/skyblock/items/accessories/intimidation.yml create mode 100644 configuration/skyblock/items/accessories/jerry.yml create mode 100644 configuration/skyblock/items/accessories/junk.yml create mode 100644 configuration/skyblock/items/accessories/kuudracore.yml create mode 100644 configuration/skyblock/items/accessories/lush.yml create mode 100644 configuration/skyblock/items/accessories/masterskull.yml create mode 100644 configuration/skyblock/items/accessories/mineral.yml create mode 100644 configuration/skyblock/items/accessories/moonglade.yml create mode 100644 configuration/skyblock/items/accessories/odger.yml create mode 100644 configuration/skyblock/items/accessories/personalcompactor.yml create mode 100644 configuration/skyblock/items/accessories/personaldeletor.yml create mode 100644 configuration/skyblock/items/accessories/pesthunter.yml create mode 100644 configuration/skyblock/items/accessories/piggy.yml create mode 100644 configuration/skyblock/items/accessories/potion.yml create mode 100644 configuration/skyblock/items/accessories/power.yml create mode 100644 configuration/skyblock/items/accessories/pressure.yml create mode 100644 configuration/skyblock/items/accessories/redclaw.yml create mode 100644 configuration/skyblock/items/accessories/respiration.yml create mode 100644 configuration/skyblock/items/accessories/runeblade.yml create mode 100644 configuration/skyblock/items/accessories/scavenger.yml create mode 100644 configuration/skyblock/items/accessories/seacreatures.yml create mode 100644 configuration/skyblock/items/accessories/seal.yml create mode 100644 configuration/skyblock/items/accessories/shark.yml create mode 100644 configuration/skyblock/items/accessories/soulcampfire.yml create mode 100644 configuration/skyblock/items/accessories/soulflow.yml create mode 100644 configuration/skyblock/items/accessories/titanium.yml create mode 100644 configuration/skyblock/items/accessories/vaccine.yml create mode 100644 configuration/skyblock/items/accessories/wither.yml create mode 100644 configuration/skyblock/items/accessories/wolf.yml create mode 100644 type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/TieredTalismansRegistry.java delete mode 100644 type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/TieredTalismanComponent.java diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java index 40c94d9fe..1aa1bcb04 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java @@ -50,16 +50,12 @@ public enum ItemType { SPEED_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), SPEED_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), SKELETON_TALISMAN(Material.SKELETON_SKULL, Rarity.COMMON), - HASTE_RING(Material.PLAYER_HEAD, Rarity.RARE), FARMING_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), LAVA_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), POTATO_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), - TALISMAN_OF_POWER(Material.PLAYER_HEAD, Rarity.COMMON), - BAT_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), FIRE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), AUTO_RECOMBOBULATOR(Material.PLAYER_HEAD, Rarity.LEGENDARY), CATACOMBS_EXPERT_RING(Material.PLAYER_HEAD, Rarity.EPIC), - WITHER_RELIC(Material.PLAYER_HEAD, Rarity.LEGENDARY), SCARFS_GRIMOIRE(Material.PLAYER_HEAD, Rarity.LEGENDARY), SCARFS_THESIS(Material.PLAYER_HEAD, Rarity.EPIC), SCARFS_STUDIES(Material.PLAYER_HEAD, Rarity.RARE), @@ -80,7 +76,246 @@ public enum ItemType { REZAR_ABICASE(Material.PLAYER_HEAD, Rarity.RARE), SUMSUNG_G3_ABICASE(Material.PLAYER_HEAD, Rarity.RARE), SUMSUNG_GG_ABICASE(Material.PLAYER_HEAD, Rarity.RARE), + SMALL_FISH_BOWL(Material.PLAYER_HEAD, Rarity.COMMON), + MEDIUM_FISH_BOWL(Material.PLAYER_HEAD, Rarity.UNCOMMON), + LARGE_FISH_BOWL(Material.PLAYER_HEAD, Rarity.RARE), + RUNEBLADE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + RUNEBLADE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + RUNEBLADE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + PRESSURE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + PRESSURE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + PRESSURE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + EMPEROR_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + EMPEROR_RING(Material.PLAYER_HEAD, Rarity.RARE), + EMPEROR_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + MOONGLADE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + MOONGLADE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MOONGLADE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + RESPIRATION_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + RESPIRATION_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + RESPIRATION_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + DRACONIC_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + DRACONIC_RING(Material.PLAYER_HEAD, Rarity.RARE), + DRACONIC_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + BLOOD_DONOR_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + BLOOD_DONOR_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BLOOD_DONOR_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + AGARIMOO_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + AGARIMOO_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + AGARIMOO_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + LUSH_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + LUSH_RING(Material.PLAYER_HEAD, Rarity.RARE), + LUSH_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + GLACIAL_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + GLACIAL_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + GLACIAL_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + WHITE_GIFT_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + GREEN_GIFT_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BLUE_GIFT_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + PURPLE_GIFT_TALISMAN(Material.PLAYER_HEAD, Rarity.EPIC), + GOLD_GIFT_TALISMAN(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CROPIE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + SQUASH_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + FERMENTO_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + HELIANTHUS_RELIC(Material.PLAYER_HEAD, Rarity.EPIC), + BIOANALYSIS_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + BIOANALYSIS_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BIOANALYSIS_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + POWER_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + POWER_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + POWER_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + POWER_RELIC(Material.PLAYER_HEAD, Rarity.EPIC), + RED_CLAW_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + RED_CLAW_RING(Material.PLAYER_HEAD, Rarity.RARE), + RED_CLAW_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + HUNTER_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + HUNTER_RING(Material.PLAYER_HEAD, Rarity.RARE), + SOULFLOW_PILE(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SOULFLOW_BATTERY(Material.PLAYER_HEAD, Rarity.RARE), + SOULFLOW_SUPERCELL(Material.PLAYER_HEAD, Rarity.EPIC), + ENDER_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + ENDER_RELIC(Material.PLAYER_HEAD, Rarity.LEGENDARY), + BURSTSTOPPER_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + BURSTSTOPPER_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + MASTER_SKULL_TIER_1(Material.PLAYER_HEAD, Rarity.COMMON), + MASTER_SKULL_TIER_2(Material.PLAYER_HEAD, Rarity.COMMON), + MASTER_SKULL_TIER_3(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MASTER_SKULL_TIER_4(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MASTER_SKULL_TIER_5(Material.PLAYER_HEAD, Rarity.RARE), + MASTER_SKULL_TIER_6(Material.PLAYER_HEAD, Rarity.EPIC), + MASTER_SKULL_TIER_7(Material.PLAYER_HEAD, Rarity.LEGENDARY), + BURNING_KUUDRA_CORE(Material.PLAYER_HEAD, Rarity.RARE), + FIERY_KUUDRA_CORE(Material.PLAYER_HEAD, Rarity.EPIC), + INFERNAL_KUUDRA_CORE(Material.PLAYER_HEAD, Rarity.LEGENDARY), + POTION_AFFINITY_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + RING_POTION_AFFINITY(Material.PLAYER_HEAD, Rarity.UNCOMMON), + ARTIFACT_POTION_AFFINITY(Material.PLAYER_HEAD, Rarity.RARE), + SEA_CREATURE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + SEA_CREATURE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SEA_CREATURE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + VACCINE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + VACCINE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + VACCINE_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + BAT_PERSON_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + BAT_PERSON_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BAT_PERSON_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + CANDY_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CANDY_RING(Material.PLAYER_HEAD, Rarity.RARE), + CANDY_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + CAT_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + LYNX_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + CHEETAH_TALISMAN(Material.PLAYER_HEAD, Rarity.EPIC), + BAT_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + BAT_RING(Material.PLAYER_HEAD, Rarity.EPIC), + BAT_ARTIFACT(Material.PLAYER_HEAD, Rarity.LEGENDARY), + FEATHER_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + FEATHER_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + FEATHER_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + PERSONAL_COMPACTOR_4000(Material.DROPPER, Rarity.UNCOMMON), + PERSONAL_COMPACTOR_5000(Material.DROPPER, Rarity.RARE), + PERSONAL_COMPACTOR_6000(Material.DROPPER, Rarity.EPIC), + PERSONAL_COMPACTOR_7000(Material.DROPPER, Rarity.LEGENDARY), + PERSONAL_DELETOR_4000(Material.DROPPER, Rarity.UNCOMMON), + PERSONAL_DELETOR_5000(Material.DROPPER, Rarity.RARE), + PERSONAL_DELETOR_6000(Material.DROPPER, Rarity.EPIC), + PERSONAL_DELETOR_7000(Material.DROPPER, Rarity.LEGENDARY), + INTIMIDATION_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + INTIMIDATION_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + INTIMIDATION_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + INTIMIDATION_RELIC(Material.PLAYER_HEAD, Rarity.EPIC), + COIN_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + RING_OF_COINS(Material.PLAYER_HEAD, Rarity.UNCOMMON), + ARTIFACT_OF_COINS(Material.PLAYER_HEAD, Rarity.RARE), + RELIC_OF_COINS(Material.PLAYER_HEAD, Rarity.EPIC), + WOLF_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + WOLF_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + HEALING_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + HEALING_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SCAVENGER_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + SCAVENGER_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SCAVENGER_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + EMERALD_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + EMERALD_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + WITHER_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + WITHER_RELIC(Material.PLAYER_HEAD, Rarity.LEGENDARY), + HASTE_RING(Material.PLAYER_HEAD, Rarity.RARE), + HASTE_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + TITANIUM_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + TITANIUM_RING(Material.PLAYER_HEAD, Rarity.RARE), + TITANIUM_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + TITANIUM_RELIC(Material.PLAYER_HEAD, Rarity.LEGENDARY), + PIGGY_BANK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CRACKED_PIGGY_BANK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BROKEN_PIGGY_BANK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SEAL_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SEAL_RING(Material.PLAYER_HEAD, Rarity.RARE), + BINGO_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + BINGO_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BINGO_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + BINGO_RELIC(Material.PLAYER_HEAD, Rarity.EPIC), + RAGGEDY_SHARK_TOOTH_NECKLACE(Material.PLAYER_HEAD, Rarity.COMMON), + DULL_SHARK_TOOTH_NECKLACE(Material.PLAYER_HEAD, Rarity.UNCOMMON), + HONED_SHARK_TOOTH_NECKLACE(Material.PLAYER_HEAD, Rarity.RARE), + SHARP_SHARK_TOOTH_NECKLACE(Material.PLAYER_HEAD, Rarity.EPIC), + RAZOR_SHARP_SHARK_TOOTH_NECKLACE(Material.PLAYER_HEAD, Rarity.LEGENDARY), + JERRY_TALISMAN_GREEN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + JERRY_TALISMAN_BLUE(Material.PLAYER_HEAD, Rarity.RARE), + JERRY_TALISMAN_PURPLE(Material.PLAYER_HEAD, Rarity.EPIC), + JERRY_TALISMAN_GOLDEN(Material.PLAYER_HEAD, Rarity.LEGENDARY), + PESTHUNTER_BADGE(Material.PLAYER_HEAD, Rarity.UNCOMMON), + PESTHUNTER_RING(Material.PLAYER_HEAD, Rarity.RARE), + PESTHUNTER_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC), + PESTHUNTER_RELIC(Material.PLAYER_HEAD, Rarity.LEGENDARY), + ANGUISH_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + ANGUISH_RING(Material.PLAYER_HEAD, Rarity.EPIC), + ANGUISH_ARTIFACT(Material.PLAYER_HEAD, Rarity.LEGENDARY), + BEASTMASTER_CREST_COMMON(Material.PLAYER_HEAD, Rarity.COMMON), + BEASTMASTER_CREST_UNCOMMON(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BEASTMASTER_CREST_RARE(Material.PLAYER_HEAD, Rarity.RARE), + BEASTMASTER_CREST_EPIC(Material.PLAYER_HEAD, Rarity.EPIC), + BEASTMASTER_CREST_LEGENDARY(Material.PLAYER_HEAD, Rarity.LEGENDARY), + MINERAL_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE), + GLOSSY_MINERAL_TALISMAN(Material.PLAYER_HEAD, Rarity.EPIC), + GREAT_SPOOK_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + GREAT_SPOOK_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + GREAT_SPOOK_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + NIBBLE_CHOCOLATE_STICK(Material.PLAYER_HEAD, Rarity.COMMON), + SMOOTH_CHOCOLATE_BAR(Material.PLAYER_HEAD, Rarity.UNCOMMON), + RICH_CHOCOLATE_CHUNK(Material.PLAYER_HEAD, Rarity.RARE), + GANACHE_CHOCOLATE_SLAB(Material.PLAYER_HEAD, Rarity.EPIC), + PRESTIGE_CHOCOLATE_REALM(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CENTURY_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + CENTURY_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + JUNK_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + JUNK_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + JUNK_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + FROZEN_CHICKEN(Material.PLAYER_HEAD, Rarity.RARE), + FRIED_FROZEN_CHICKEN(Material.PLAYER_HEAD, Rarity.EPIC), + ANITA_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON), + ANITA_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + ANITA_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE), + ODGERS_BRONZE_TOOTH(Material.PLAYER_HEAD, Rarity.COMMON), + ODGERS_SILVER_TOOTH(Material.PLAYER_HEAD, Rarity.UNCOMMON), + ODGERS_GOLD_TOOTH(Material.PLAYER_HEAD, Rarity.RARE), + ODGERS_DIAMOND_TOOTH(Material.PLAYER_HEAD, Rarity.EPIC), CAMPFIRE_TALISMAN_1(Material.PLAYER_HEAD, Rarity.COMMON), + CAMPFIRE_TALISMAN_2(Material.PLAYER_HEAD, Rarity.COMMON), + CAMPFIRE_TALISMAN_3(Material.PLAYER_HEAD, Rarity.COMMON), + CAMPFIRE_TALISMAN_4(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CAMPFIRE_TALISMAN_5(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CAMPFIRE_TALISMAN_6(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CAMPFIRE_TALISMAN_7(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CAMPFIRE_TALISMAN_8(Material.PLAYER_HEAD, Rarity.RARE), + CAMPFIRE_TALISMAN_9(Material.PLAYER_HEAD, Rarity.RARE), + CAMPFIRE_TALISMAN_10(Material.PLAYER_HEAD, Rarity.RARE), + CAMPFIRE_TALISMAN_11(Material.PLAYER_HEAD, Rarity.RARE), + CAMPFIRE_TALISMAN_12(Material.PLAYER_HEAD, Rarity.RARE), + CAMPFIRE_TALISMAN_13(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_14(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_15(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_16(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_17(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_18(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_19(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_20(Material.PLAYER_HEAD, Rarity.EPIC), + CAMPFIRE_TALISMAN_21(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_22(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_23(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_24(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_25(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_26(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_27(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_28(Material.PLAYER_HEAD, Rarity.LEGENDARY), + CAMPFIRE_TALISMAN_29(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_1(Material.PLAYER_HEAD, Rarity.COMMON), + SOUL_CAMPFIRE_TALISMAN_2(Material.PLAYER_HEAD, Rarity.COMMON), + SOUL_CAMPFIRE_TALISMAN_3(Material.PLAYER_HEAD, Rarity.COMMON), + SOUL_CAMPFIRE_TALISMAN_4(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SOUL_CAMPFIRE_TALISMAN_5(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SOUL_CAMPFIRE_TALISMAN_6(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SOUL_CAMPFIRE_TALISMAN_7(Material.PLAYER_HEAD, Rarity.UNCOMMON), + SOUL_CAMPFIRE_TALISMAN_8(Material.PLAYER_HEAD, Rarity.RARE), + SOUL_CAMPFIRE_TALISMAN_9(Material.PLAYER_HEAD, Rarity.RARE), + SOUL_CAMPFIRE_TALISMAN_10(Material.PLAYER_HEAD, Rarity.RARE), + SOUL_CAMPFIRE_TALISMAN_11(Material.PLAYER_HEAD, Rarity.RARE), + SOUL_CAMPFIRE_TALISMAN_12(Material.PLAYER_HEAD, Rarity.RARE), + SOUL_CAMPFIRE_TALISMAN_13(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_14(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_15(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_16(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_17(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_18(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_19(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_20(Material.PLAYER_HEAD, Rarity.EPIC), + SOUL_CAMPFIRE_TALISMAN_21(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_22(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_23(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_24(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_25(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_26(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_27(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_28(Material.PLAYER_HEAD, Rarity.LEGENDARY), + SOUL_CAMPFIRE_TALISMAN_29(Material.PLAYER_HEAD, Rarity.LEGENDARY), /** * Community Shop Items diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeGemData.java b/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeGemData.java index e59df3b9c..303735758 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeGemData.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/item/attribute/attributes/ItemAttributeGemData.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import net.swofty.commons.skyblock.item.ItemType; +import net.swofty.commons.skyblock.item.SkyBlockItemType; import net.swofty.commons.skyblock.item.attribute.ItemAttribute; import net.swofty.commons.skyblock.statistics.ItemStatistics; diff --git a/configuration/skyblock/items/accessories/abicases.yml b/configuration/skyblock/items/accessories/abicases.yml index 899eee69e..968eb8cb8 100644 --- a/configuration/skyblock/items/accessories/abicases.yml +++ b/configuration/skyblock/items/accessories/abicases.yml @@ -8,6 +8,7 @@ items: - id: SKULL_HEAD texture: a3c153c391c34e2d328a60839e683a9f82ad3048299d8bc6a39e6f915cc5a - id: ACCESSORY + - id: BLUE_BUT_GREEN_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -17,6 +18,7 @@ items: - id: SKULL_HEAD texture: a9909a9779b946b9787442fa483af4de4b2f19fd40dc2370f7a9b8f521f21ddc - id: TALISMAN + - id: BLUE_BUT_RED_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -26,6 +28,7 @@ items: - id: SKULL_HEAD texture: 85e4f9da68c81fa481eecdca48a138cecde2cddffeeae84ab1afd24a363e028 - id: TALISMAN + - id: BLUE_BUT_YELLOW_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -35,6 +38,7 @@ items: - id: SKULL_HEAD texture: a254aacbf623175ff98df7ae366e0b89e91713441752f3cdf965f038b174b5 - id: TALISMAN + - id: LIGHTER_BLUE_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -44,6 +48,7 @@ items: - id: SKULL_HEAD texture: df70fab3246fe027ce0bba885a73c6e82d8ff8f358231e8461f956560cfa58f - id: TALISMAN + - id: REZAR_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -53,6 +58,7 @@ items: - id: SKULL_HEAD texture: b2128f48d997186563fbc5b47a88c0d0aac92fa2c285cd1fae420c34fa8f2010 - id: TALISMAN + - id: SUMSUNG_G3_ABICASE material: PLAYER_HEAD rarity: COMMON @@ -62,6 +68,7 @@ items: - id: SKULL_HEAD texture: 70ce32b90e16419319daf35e6ad01bb715d898548b9ef66dd799a00107e87376 - id: TALISMAN + - id: SUMSUNG_GG_ABICASE material: PLAYER_HEAD rarity: COMMON diff --git a/configuration/skyblock/items/accessories/accessories.yml b/configuration/skyblock/items/accessories/accessories.yml index 6424a5200..7c246f03c 100644 --- a/configuration/skyblock/items/accessories/accessories.yml +++ b/configuration/skyblock/items/accessories/accessories.yml @@ -1,15 +1,4 @@ items: - - id: BAT_TALISMAN - material: PLAYER_HEAD - rarity: COMMON - default_statistics: - health: 1.0 - speed: 1.0 - intelligence: 1.0 - components: - - id: SKULL_HEAD - texture: 9e99deef919db66ac2bd28d6302756ccd57c7f8b12b9dca8f41c3e0a04ac1cc - - id: ACCESSORY - id: BITS_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -17,6 +6,7 @@ items: - id: SKULL_HEAD texture: 2ebadb1725aa85bb2810d0b73bf7cd74db3d9d8fc61c4cf9e543dbcc199187cc - id: TALISMAN + - id: FARMING_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -26,6 +16,7 @@ items: - id: SKULL_HEAD texture: 9af328c87b068509aca9834eface197705fe5d4f0871731b7b21cd99b9fddc - id: TALISMAN + - id: FIRE_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -33,13 +24,7 @@ items: - id: SKULL_HEAD texture: 9af328c87b068509aca9834eface197705fe5d4f0871731b7b21cd99b9fddc - id: TALISMAN - - id: HASTE_RING - material: PLAYER_HEAD - rarity: COMMON - components: - - id: SKULL_HEAD - texture: 3c26a1ec929d4b144266c56af11d9abaf93f6b274872c96d3e34cb7c7965 - - id: TALISMAN + - id: LAVA_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -47,6 +32,7 @@ items: - id: SKULL_HEAD texture: c078f3f24b1760f9d4abb0851eb8f6c7dfff8855708e6049d15dc02042ba8436 - id: TALISMAN + - id: MINE_AFFINITY_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -56,6 +42,7 @@ items: - id: SKULL_HEAD texture: d9563fdc4acab6db324b21bc43b238fe465e530a6327e7eef11d2d0c4ea - id: TALISMAN + - id: POTATO_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -65,13 +52,7 @@ items: - id: SKULL_HEAD texture: 318476e3cf0d5fc8ab1761065cf0e372b11004ed4c97156396e17c869b4aa389 - id: TALISMAN - - id: TALISMAN_OF_POWER - material: PLAYER_HEAD - rarity: COMMON - components: - - id: SKULL_HEAD - texture: c6736fd95d3a6a4aaac46709a07aec7f1c38f0a3aae573e6f483388819412b65 - - id: TALISMAN + - id: VILLAGE_AFFINITY_TALISMAN material: PLAYER_HEAD rarity: COMMON @@ -80,11 +61,4 @@ items: components: - id: SKULL_HEAD texture: 9c11d6c79b8a1f18902d783cdda4bdfb9d47337b73791028a126a6e6cf101def - - id: TALISMAN - - id: WITHER_RELIC - material: PLAYER_HEAD - rarity: COMMON - components: - - id: SKULL_HEAD - texture: 17b8ef7e8e0af19399cc32485f2ee47b2bb4d5802c71b3021f4d5d6b5f3afe03 - - id: ACCESSORY + - id: TALISMAN \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/agarimoo.yml b/configuration/skyblock/items/accessories/agarimoo.yml new file mode 100644 index 000000000..d1b2962ab --- /dev/null +++ b/configuration/skyblock/items/accessories/agarimoo.yml @@ -0,0 +1,42 @@ +items: + - id: AGARIMOO_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + fishing_speed: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Agarimoo Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 3d597f77cde32c9ac9b06f82fcf7c9cb500facc14bff166222b24be39962f0ef + - id: NOT_FINISHED_YET + + - id: AGARIMOO_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + fishing_speed: 2 + fishing_wisdom: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Agarimoo Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: d3ebf38b4a708eb00745d1fb87a53cb81a7af6cc178d9a2c1116c2cbcff94fea + - id: NOT_FINISHED_YET + + - id: AGARIMOO_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + fishing_speed: 3 + farming_wisdom: 1 + fishing_wisdom: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Agarimoo Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7f3130468ac480a427db13ad13e8ca8526b538ab7ad7d69fc9952f3c53aea8d1 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/anguish.yml b/configuration/skyblock/items/accessories/anguish.yml new file mode 100644 index 000000000..b4e272777 --- /dev/null +++ b/configuration/skyblock/items/accessories/anguish.yml @@ -0,0 +1,48 @@ +items: + - id: ANGUISH_TALISMAN + material: PLAYER_HEAD + rarity: RARE + lore: + - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?' + default_statistics: + true_defense: 0.5 + magic_find: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anguish Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 8d4793f4c7df5dbb7c67ac6cc551ee0d9998e15e35a737bc27ee453103a00b14 + - id: NOT_FINISHED_YET + + - id: ANGUISH_RING + material: PLAYER_HEAD + rarity: EPIC + lore: + - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?' + default_statistics: + true_defense: 1 + magic_find: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anguish Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 73de3d0e0d7d2345a902305196012874411040ebe2c4e95fb2587dd4d1c09f37 + - id: NOT_FINISHED_YET + + - id: ANGUISH_ARTIFACT + material: PLAYER_HEAD + rarity: LEGENDARY + lore: + - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?' + default_statistics: + true_defense: 1.5 + magic_find: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anguish Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 215e22698071bc74bdfde25f61d8f69028c0e7b8ed82366c287315e56a233efc + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/anita.yml b/configuration/skyblock/items/accessories/anita.yml new file mode 100644 index 000000000..0657f0c40 --- /dev/null +++ b/configuration/skyblock/items/accessories/anita.yml @@ -0,0 +1,33 @@ +items: + - id: ANITA_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anita's Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: bb8ec57b37fdf093fe66efe2ac070a8f5181949970a4458d56ec9701eded8cff + - id: NOT_FINISHED_YET + + - id: ANITA_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anita's Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 59a1035bc6f00fddc8e0291c38319408babc84ae10648cb5258ed8b55d60e0c3 + - id: NOT_FINISHED_YET + + - id: ANITA_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Anita's Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 8feabdadd5f593771fa23c94fc6816091917371fd5a1c74723e716210d6e6efb + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/bat.yml b/configuration/skyblock/items/accessories/bat.yml new file mode 100644 index 000000000..9592cdd69 --- /dev/null +++ b/configuration/skyblock/items/accessories/bat.yml @@ -0,0 +1,45 @@ +items: + - id: BAT_TALISMAN + material: PLAYER_HEAD + rarity: RARE + default_statistics: + health: 1 + intelligence: 1 + speed: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4f89fc5137631f6b543931bf7af1dde0aef8c69cbe5b8bafe2166f3b1c7e1a69 + - id: NOT_FINISHED_YET + + - id: BAT_RING + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + health: 3 + intelligence: 2 + speed: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: bc78314255d8864a753fe95622564046f0dee2a82c6e4e2e7f452fcb95af318c + - id: NOT_FINISHED_YET + + - id: BAT_ARTIFACT + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health: 5 + intelligence: 3 + speed: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 377ade8afb257086fb1861da43c8ae468b8eb0578fada84303858517ba17217e + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/batperson.yml b/configuration/skyblock/items/accessories/batperson.yml new file mode 100644 index 000000000..37616d83a --- /dev/null +++ b/configuration/skyblock/items/accessories/batperson.yml @@ -0,0 +1,32 @@ +items: + - id: BAT_PERSON_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Person Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: b841a49b199a59c431bf3fc3783f6b6545ce78c38042617f66ebd87cdd548e8c + - id: NOT_FINISHED_YET + + - id: BAT_PERSON_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Person Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: b4451ecf2584a36de4297031c6d852977d3e249e85a3f0add967fcd7d6bde953 + - id: NOT_FINISHED_YET + + - id: BAT_PERSON_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bat Person Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: c4444c3982720b30938f504c4374232b11a4f6f56cd57c973d8abb07fd0dcff7 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/bestmastercrest.yml b/configuration/skyblock/items/accessories/bestmastercrest.yml new file mode 100644 index 000000000..4afc4b587 --- /dev/null +++ b/configuration/skyblock/items/accessories/bestmastercrest.yml @@ -0,0 +1,54 @@ +items: + - id: BEASTMASTER_CREST_COMMON + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Beastmaster Crest + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53415667de3fb89c5f40c880c39e4971a0caa7f3a9d2c8f712ba37fadcee + - id: NOT_FINISHED_YET + + - id: BEASTMASTER_CREST_UNCOMMON + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Beastmaster Crest + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53415667de3fb89c5f40c880c39e4971a0caa7f3a9d2c8f712ba37fadcee + - id: NOT_FINISHED_YET + + - id: BEASTMASTER_CREST_RARE + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Beastmaster Crest + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53415667de3fb89c5f40c880c39e4971a0caa7f3a9d2c8f712ba37fadcee + - id: NOT_FINISHED_YET + + - id: BEASTMASTER_CREST_EPIC + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Beastmaster Crest + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53415667de3fb89c5f40c880c39e4971a0caa7f3a9d2c8f712ba37fadcee + - id: NOT_FINISHED_YET + + - id: BEASTMASTER_CREST_LEGENDARY + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Beastmaster Crest + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53415667de3fb89c5f40c880c39e4971a0caa7f3a9d2c8f712ba37fadcee + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/bingo.yml b/configuration/skyblock/items/accessories/bingo.yml new file mode 100644 index 000000000..585907706 --- /dev/null +++ b/configuration/skyblock/items/accessories/bingo.yml @@ -0,0 +1,44 @@ +items: + - id: BINGO_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bingo Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2f25944b7465ff4586a341f881f488b6f9d4b3ffc100f50a77087075b3ceb1b + - id: NOT_FINISHED_YET + + - id: BINGO_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bingo Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 22f2499ab4cfc97e65f0fa9fe63cc606707a4ae96af407846b1b5354f3fad99 + - id: NOT_FINISHED_YET + + - id: BINGO_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bingo Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: d2dad868f8d865baa32d6158672d1b134db61ea56d33efa0c09f6ba6f276ff2 + - id: NOT_FINISHED_YET + + - id: BINGO_RELIC + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bingo Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: c515acf4a6ac698736e54def0bc78143c14449978e750afbb8d7ade0adf0ef00 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/bioanalysis.yml b/configuration/skyblock/items/accessories/bioanalysis.yml new file mode 100644 index 000000000..00ad762ed --- /dev/null +++ b/configuration/skyblock/items/accessories/bioanalysis.yml @@ -0,0 +1,39 @@ +items: + - id: BIOANALYSIS_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bioanalysis Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 19ca2fedab02df448906b25f25f2df2c9b9c532ce48276447113dca6825e9e05 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: BIOANALYSIS_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bioanalysis Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 80b774ffeb5878d6e34e9f244642e4ee489fd1dc9a2da52b87e2ecc0449c22f9 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: BIOANALYSIS_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Bioanalysis Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: e5f2e8e4f040d1dbef5a5369bd09db86a79b81a249547e458b3cc5997e24c0eb + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/blooddonor.yml b/configuration/skyblock/items/accessories/blooddonor.yml new file mode 100644 index 000000000..b295587a4 --- /dev/null +++ b/configuration/skyblock/items/accessories/blooddonor.yml @@ -0,0 +1,51 @@ +items: + - id: BLOOD_DONOR_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + lore: + - Do your part bro. + default_statistics: + health_regeneration: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Blood Donor Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4463e5334ecd9b3b986f6e9cb04dba3b643a63f39e934ead76ece518f82f865 + - id: SELLABLE + value: 800 + - id: NOT_FINISHED_YET + + - id: BLOOD_DONOR_RING + material: PLAYER_HEAD + rarity: UNCOMMON + lore: + - There's like 5 liters in you. + default_statistics: + health_regeneration: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Blood Donor Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: e3e95c83f54e2662f0b0df287afb5c48d9cad2eac46cb80c8cb4c4f468e13c33 + - id: SELLABLE + value: 2000 + - id: NOT_FINISHED_YET + + - id: BLOOD_DONOR_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + lore: + - The human body produces 2-3 million red blood cells per SECOND. + default_statistics: + health_regeneration: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Blood Donor Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: ff7bb97480c10fdfeb8fae93929e5eeb4f0491d8cca70ed00b45e3fb2b74f6c5 + - id: SELLABLE + value: 10000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/burststopper.yml b/configuration/skyblock/items/accessories/burststopper.yml new file mode 100644 index 000000000..57166997e --- /dev/null +++ b/configuration/skyblock/items/accessories/burststopper.yml @@ -0,0 +1,28 @@ +items: + - id: BURSTSTOPPER_TALISMAN + material: PLAYER_HEAD + rarity: RARE + default_statistics: + strength: 1 + true_defense: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Burststopper Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5b68ad1a3ac2444d7bddc22eefecd5d61b4d326871179119c52a7740b4d83cc7 + - id: NOT_FINISHED_YET + + - id: BURSTSTOPPER_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + strength: 2 + true_defense: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Burststopper Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 89cbbbe7ed0356d5846596c4ad1cfa9fa719db1c4568f3f7f0c7979e7a401208 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/campfire.yml b/configuration/skyblock/items/accessories/campfire.yml index cd01ba5d5..9496cac79 100644 --- a/configuration/skyblock/items/accessories/campfire.yml +++ b/configuration/skyblock/items/accessories/campfire.yml @@ -15,3 +15,385 @@ items: coop_allowed: false - id: CUSTOM_DISPLAY_NAME name: "§fCampfire Initiate Badge I" + + - id: CAMPFIRE_TALISMAN_2 + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Initiate Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 3ada666715bfd2aa9fbd81daef59b9fe1c96c4fa0d08dbc72eae5633177dbf88 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_3 + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Initiate Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 3ada666715bfd2aa9fbd81daef59b9fe1c96c4fa0d08dbc72eae5633177dbf88 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_4 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Adept Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 437a7acf6f23c35827acfb0e0d3bcaf8ec3f8548134dd1151128857750812649 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_5 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Adept Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 437a7acf6f23c35827acfb0e0d3bcaf8ec3f8548134dd1151128857750812649 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_6 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Adept Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 437a7acf6f23c35827acfb0e0d3bcaf8ec3f8548134dd1151128857750812649 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_7 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Adept Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: 437a7acf6f23c35827acfb0e0d3bcaf8ec3f8548134dd1151128857750812649 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_8 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Cultist Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9886cc8eed3cbe54fe963679e6c58e4599478304711763f6b728fd8767060350 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_9 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Cultist Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9886cc8eed3cbe54fe963679e6c58e4599478304711763f6b728fd8767060350 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_10 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Cultist Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9886cc8eed3cbe54fe963679e6c58e4599478304711763f6b728fd8767060350 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_11 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Cultist Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9886cc8eed3cbe54fe963679e6c58e4599478304711763f6b728fd8767060350 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_12 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Cultist Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9886cc8eed3cbe54fe963679e6c58e4599478304711763f6b728fd8767060350 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_13 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_14 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_15 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_16 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_17 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_18 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge VI + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_19 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge VII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_20 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire Scion Badge VIII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fb5aedfaf157d3dd00383980cd35556aec3767c67d3e8e12244ea2fde198146 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_21 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_22 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 1.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_23 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_24 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 2.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_25 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_26 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 3.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge VI + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_27 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 4 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge VII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_28 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 4.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge VIII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9e97fe2e0c3a932f76415b24170509ddf3873a44cccfa3c281a92f76cea1a254 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CAMPFIRE_TALISMAN_29 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + health_regeneration: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Campfire God Badge IX + - id: ACCESSORY + - id: SKULL_HEAD + texture: f06818c2368dda8732e26b485acf1897efa4afadc4390cea3359ab104d73ad5e + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/candy.yml b/configuration/skyblock/items/accessories/candy.yml new file mode 100644 index 000000000..455d81993 --- /dev/null +++ b/configuration/skyblock/items/accessories/candy.yml @@ -0,0 +1,33 @@ +items: + - id: CANDY_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Candy Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: e6ae8c4c983ac24d93c48417a95beeb1ca055b9b49764143cc98c1392548eed3 + - id: NOT_FINISHED_YET + + - id: CANDY_RING + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Candy Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 18c0d7034a7dac30e2b52c00eeec0eca55fe688d25faf4efd9c0a07dce9eaf30 + - id: NOT_FINISHED_YET + + - id: CANDY_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Candy Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: b797add1b3ae64d510bcc6ac16c2fa1dd69369edf59821239c955f7f11e1177b + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/cat.yml b/configuration/skyblock/items/accessories/cat.yml new file mode 100644 index 000000000..e572be02c --- /dev/null +++ b/configuration/skyblock/items/accessories/cat.yml @@ -0,0 +1,51 @@ +items: + - id: CAT_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + speed: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Cat Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2220107a77f8eac0743ee8cca378183d256c4a89ac9660ef942cd3759467ba01 + - id: SELLABLE + value: 1000 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: LYNX_TALISMAN + material: PLAYER_HEAD + rarity: RARE + default_statistics: + speed: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Lynx Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2360f1de777efe05d272a61cfeea0006496aacadf1943573a3f0d7655016e609 + - id: SELLABLE + value: 1000 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: CHEETAH_TALISMAN + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + speed: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Cheetah Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 8ca45bf11990f018f3b0b8d49a432ea4e9dcef75621126f0568d7900e169a8e2 + - id: SELLABLE + value: 1000 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/century.yml b/configuration/skyblock/items/accessories/century.yml new file mode 100644 index 000000000..cebd73950 --- /dev/null +++ b/configuration/skyblock/items/accessories/century.yml @@ -0,0 +1,26 @@ +items: + - id: CENTURY_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + lore: + - What's better than a party? A party with free goodies! + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Talisman of the Century + - id: ACCESSORY + - id: SKULL_HEAD + texture: 720b77eaa6bc4a183a6888ba52df48417a6e385c3b463ac49b40a3b96e0a5b75 + - id: NOT_FINISHED_YET + + - id: CENTURY_RING + material: PLAYER_HEAD + rarity: UNCOMMON + lore: + - What's better than a party? A party with free goodies and an accessory upgrade! + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ring of the Century + - id: ACCESSORY + - id: SKULL_HEAD + texture: dda95b02398026109c42cc22e7d82d4e1d7a58adf11009cedbef36496ff8dc58 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/chocolate.yml b/configuration/skyblock/items/accessories/chocolate.yml new file mode 100644 index 000000000..15999b816 --- /dev/null +++ b/configuration/skyblock/items/accessories/chocolate.yml @@ -0,0 +1,65 @@ +items: + - id: NIBBLE_CHOCOLATE_STICK + material: PLAYER_HEAD + rarity: COMMON + lore: + - '%%dark_gray%%%%italic%%A delightful treat from the Factory. Its crisp taste sparks joy with every bite.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Nibble Chocolate Stick + - id: ACCESSORY + - id: SKULL_HEAD + texture: 888188d62908af6e114f73a109e15ac7f1faded39abd6a2054034ec5cc70c727 + - id: NOT_FINISHED_YET + + - id: SMOOTH_CHOCOLATE_BAR + material: PLAYER_HEAD + rarity: UNCOMMON + lore: + - '%%dark_gray%%%%italic%%Crafted in the Factory, its smoothness melts hearts and tastes like a sweet escape.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Smooth Chocolate Bar + - id: ACCESSORY + - id: SKULL_HEAD + texture: a9372efd2ca1a6c6dfc066f1ec83f9456575c3850a0e7d01109c4f1af300ba8 + - id: NOT_FINISHED_YET + + - id: RICH_CHOCOLATE_CHUNK + material: PLAYER_HEAD + rarity: RARE + lore: + - '%%dark_gray%%%%italic%%From the Factory''s secret reserves, its rich flavor is a deep dive into indulgence.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Rich Chocolate Chunk + - id: ACCESSORY + - id: SKULL_HEAD + texture: 6f942717364c0fecf7ad11bac8cd98dd7ad4dbd72e3d3ce2b57eb48713824ff + - id: NOT_FINISHED_YET + + - id: GANACHE_CHOCOLATE_SLAB + material: PLAYER_HEAD + rarity: EPIC + lore: + - '%%dark_gray%%%%italic%%A Factory masterpiece - its divine taste transcends reality, offering a heavenly escape.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ganache Chocolate Slab + - id: ACCESSORY + - id: SKULL_HEAD + texture: f89512331edfdc27cb7d4e80f3e0db460d05caf66c7c1c42e0e712130a9b690 + - id: NOT_FINISHED_YET + + - id: PRESTIGE_CHOCOLATE_REALM + material: PLAYER_HEAD + rarity: LEGENDARY + lore: + - '%%dark_gray%%%%italic%%The Factory''s pinnacle creation - its epic taste shatters expectations, offering a taste of utopia.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Prestige Chocolate Realm + - id: ACCESSORY + - id: SKULL_HEAD + texture: af19ceeabf2ecb020610b8aabc9299264fa670048c010c9699ce687fc9bf351e + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/coin.yml b/configuration/skyblock/items/accessories/coin.yml new file mode 100644 index 000000000..d1fb22da2 --- /dev/null +++ b/configuration/skyblock/items/accessories/coin.yml @@ -0,0 +1,45 @@ +items: + - id: COIN_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Talisman of Coins + - id: ACCESSORY + - id: SKULL_HEAD + texture: 35a12dc77e8969fb775b9159c9d7e1999ea31a6a6e39a729b5ef8c876fc63c6a + - id: SELLABLE + value: 70 + - id: NOT_FINISHED_YET + + - id: RING_OF_COINS + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ring of Coins + - id: ACCESSORY + - id: SKULL_HEAD + texture: 41a3e7c7699bf8378f582c1d3eb9af068b85db235ba78ebb253a04af3ec565a3 + - id: NOT_FINISHED_YET + + - id: ARTIFACT_OF_COINS + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Artifact of Coins + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4d7318c21c2a53693222cd60191518a8e2a885956dd0823b6142c9ce77d13811 + - id: NOT_FINISHED_YET + + - id: RELIC_OF_COINS + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Relic of Coins + - id: ACCESSORY + - id: SKULL_HEAD + texture: a4285382178f7abd9ee8291340aafbe3f616785cee39dab654e135c9525f1a87 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/draconic.yml b/configuration/skyblock/items/accessories/draconic.yml new file mode 100644 index 000000000..e6162dde4 --- /dev/null +++ b/configuration/skyblock/items/accessories/draconic.yml @@ -0,0 +1,39 @@ +items: + - id: DRACONIC_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + health: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Draconic Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 11c51b946cb484b9c76b2c5bf5eab0c74c9ced95f35aa81e699bd5d9b57e20f + - id: NOT_FINISHED_YET + + - id: DRACONIC_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + health: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Draconic Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: fee1e74047277a70661a8eaf9c4c6ebf83554b275a16816ec79bba1bce320434 + - id: NOT_FINISHED_YET + + - id: DRACONIC_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + health: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Draconic Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: ead7dcbe93401b3d3b4e5222ef8097aef4431f48064d0a0531fa0952c211e0e6 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/dungeon.yml b/configuration/skyblock/items/accessories/dungeon.yml index 9813d308e..7aab271b5 100644 --- a/configuration/skyblock/items/accessories/dungeon.yml +++ b/configuration/skyblock/items/accessories/dungeon.yml @@ -6,6 +6,7 @@ items: - id: ACCESSORY - id: SKULL_HEAD texture: 5dff8dbbab15bfbb11e23b1f50b34ef548ad9832c0bd7f5a13791adad0057e1b + - id: CATACOMBS_EXPERT_RING material: PLAYER_HEAD rarity: COMMON diff --git a/configuration/skyblock/items/accessories/emerald.yml b/configuration/skyblock/items/accessories/emerald.yml new file mode 100644 index 000000000..2e30243ed --- /dev/null +++ b/configuration/skyblock/items/accessories/emerald.yml @@ -0,0 +1,26 @@ +items: + - id: EMERALD_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Emerald Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: a8e50d027da90dbea8a66088aba6f978eac8a7beb6561020f0289fcd43d89c68 + - id: SELLABLE + value: 7600 + - id: NOT_FINISHED_YET + + - id: EMERALD_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Emerald Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: fd88161a7da12461e260dc7678b94b9c5e62fcd38213d1f808e36b4335808094 + - id: SELLABLE + value: 7600 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/emperor.yml b/configuration/skyblock/items/accessories/emperor.yml new file mode 100644 index 000000000..f110827f9 --- /dev/null +++ b/configuration/skyblock/items/accessories/emperor.yml @@ -0,0 +1,39 @@ +items: + - id: EMPEROR_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Emperor's Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4038b3fabec7e8bb9ee83f03d9284af72abe3d4a204f6220673292086b5619af + - id: SELLABLE + value: 100 + - id: NOT_FINISHED_YET + + - id: EMPEROR_RING + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Emperor's Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7d6dd941ce3917d757fbd6ab288c87a236602fd94d4920f6ec3ac344c5faac33 + - id: SELLABLE + value: 900 + - id: NOT_FINISHED_YET + + - id: EMPEROR_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Emperor's Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: e9b1d718e24a8cdd52252102cc7c7a94c73a15d3faf3bc3a8315daa2b947c539 + - id: SELLABLE + value: 8100 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/ender.yml b/configuration/skyblock/items/accessories/ender.yml new file mode 100644 index 000000000..829f0a636 --- /dev/null +++ b/configuration/skyblock/items/accessories/ender.yml @@ -0,0 +1,22 @@ +items: + - id: ENDER_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ender Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 288748014809862e8bd210a0a3dfcd7be6e0ddc7b453e3947ee6d73f46fde9e2 + - id: NOT_FINISHED_YET + + - id: ENDER_RELIC + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ender Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: 288748014809862e8bd210a0a3dfcd7be6e0ddc7b453e3947ee6d73f46fde9e2 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/feather.yml b/configuration/skyblock/items/accessories/feather.yml new file mode 100644 index 000000000..e51c7f673 --- /dev/null +++ b/configuration/skyblock/items/accessories/feather.yml @@ -0,0 +1,38 @@ +items: + - id: FEATHER_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Feather Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5120a863869320af4cfa7d1d58d0b2dd8182eb0be834b8caaeb5639421cd893b + - id: SELLABLE + value: 160 + - id: NOT_FINISHED_YET + + - id: FEATHER_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Feather Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: cb6851f4e9a87707ad72f5b5cd17efeca36c2c18cc99aaad7121fe72cf79b9b1 + - id: SELLABLE + value: 1800 + - id: NOT_FINISHED_YET + + - id: FEATHER_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Feather Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: da239e8b52ed91fe518d7c690b03de9dc69846a8d5c208ac1c102edd68d9ca18 + - id: SELLABLE + value: 32000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/fishbowl.yml b/configuration/skyblock/items/accessories/fishbowl.yml new file mode 100644 index 000000000..458a1906d --- /dev/null +++ b/configuration/skyblock/items/accessories/fishbowl.yml @@ -0,0 +1,39 @@ +items: + - id: SMALL_FISH_BOWL + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Small Fish Bowl + - id: ACCESSORY + - id: SKULL_HEAD + texture: 777447c9c815f02e7ce9414b749a326ab83beb4f14b9c84418f0b11b7b013735 + - id: SELLABLE + value: 100 + - id: NOT_FINISHED_YET + + - id: MEDIUM_FISH_BOWL + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Medium Fish Bowl + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2b8d3b3328b46ea7b7dc67c43bdff6dbaebcdc0b582e6c7fb1574b38ac0c9ad3 + - id: SELLABLE + value: 500 + - id: NOT_FINISHED_YET + + - id: LARGE_FISH_BOWL + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Large Fish Bowl + - id: ACCESSORY + - id: SKULL_HEAD + texture: a8b631b344b6c9e1b1c1e779d71c59df54b3e2ec20e63ca4c293d6d59905f044 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/frozenchicken.yml b/configuration/skyblock/items/accessories/frozenchicken.yml new file mode 100644 index 000000000..0d1020f5e --- /dev/null +++ b/configuration/skyblock/items/accessories/frozenchicken.yml @@ -0,0 +1,36 @@ +items: + - id: FROZEN_CHICKEN + material: PLAYER_HEAD + rarity: RARE + default_statistics: + speed: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Frozen Chicken + - id: ACCESSORY + - id: SKULL_HEAD + texture: d61c33024246ed219a1317e2459130f2aed227655e85cf01fc513481236d8dd1 + - id: SELLABLE + value: 1 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: FRIED_FROZEN_CHICKEN + material: PLAYER_HEAD + rarity: EPIC + lore: + - '%%dark_gray%%%%italic%%Fried Frozen?! There is no such thing!' + default_statistics: + speed: 1 + heat_resistance: 1 + cold_resistance: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Fried Frozen Chicken + - id: ACCESSORY + - id: SKULL_HEAD + texture: adf30116f254f60167cee4137122783d2b4a4ccc36373077d507352424045ce4 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/garden.yml b/configuration/skyblock/items/accessories/garden.yml new file mode 100644 index 000000000..2c3305c89 --- /dev/null +++ b/configuration/skyblock/items/accessories/garden.yml @@ -0,0 +1,67 @@ +items: + - id: CROPIE_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + wheat_fortune: 10 + potato_fortune: 10 + carrot_fortune: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Cropie Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: ac7d5520a73e1d6d785496b5f5af8c9e14b40d6f6ebd629231ddbce27d422214 + - id: NOT_FINISHED_YET + + - id: SQUASH_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + wheat_fortune: 20 + potato_fortune: 20 + carrot_fortune: 20 + pumpkin_fortune: 20 + melon_fortune: 20 + cocoa_beans_fortune: 20 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Squash Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: f881a38800a1c867d2a1a8a10c8543ae8a3b8a9a87c1ac58ba1e283bb0dc3d68 + - id: NOT_FINISHED_YET + + - id: FERMENTO_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + wheat_fortune: 30 + potato_fortune: 30 + carrot_fortune: 30 + pumpkin_fortune: 30 + melon_fortune: 30 + cactus_fortune: 30 + cocoa_beans_fortune: 30 + mushroom_fortune: 30 + sugar_cane_fortune: 30 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Fermento Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: e1add7231c97e77a169be764a41f981cc9f542aa8c6a1336d8be2d817211bbfd + - id: NOT_FINISHED_YET + + - id: HELIANTHUS_RELIC + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + farming_fortune: 40 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Helianthus Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2e6c711f74f92bcbe486ec7e67810a16f0d1eaaac39b80d7a650cd81d611a2e7 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/gift.yml b/configuration/skyblock/items/accessories/gift.yml new file mode 100644 index 000000000..2ad616fd2 --- /dev/null +++ b/configuration/skyblock/items/accessories/gift.yml @@ -0,0 +1,55 @@ +items: + - id: WHITE_GIFT_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: White Gift Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: e47b37e67a89159bf4acc4a44d4328f4efc0181605142288e5eed1ab8aed913c + - id: NOT_FINISHED_YET + + - id: GREEN_GIFT_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Green Gift Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 28dc3c84491c4ff103de6ea01880e2d83432cd4878b84d6b43253cc51fd978e7 + - id: NOT_FINISHED_YET + + - id: BLUE_GIFT_TALISMAN + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Blue Gift Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5b85e29f29ec9a90e482ea5b8391bcb4560bbae0dcd15d7ce1d86016b4356e98 + - id: NOT_FINISHED_YET + + - id: PURPLE_GIFT_TALISMAN + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Purple Gift Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: e9e39d91c04c30cc1f530fee798eed279dde60f95c2e1d155c0fdd361d0962ed + - id: NOT_FINISHED_YET + + - id: GOLD_GIFT_TALISMAN + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Gold Gift Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: abd98792dd92d9719894341ac9012a584c4428558fd2c712f78e5f0d4da85470 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/glacial.yml b/configuration/skyblock/items/accessories/glacial.yml new file mode 100644 index 000000000..46d4e13e6 --- /dev/null +++ b/configuration/skyblock/items/accessories/glacial.yml @@ -0,0 +1,33 @@ +items: + - id: GLACIAL_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Glacial Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: cb8f4a68845622b80caf7ac924d48bafaefc819c47c67f93978a09bc082983ff + - id: NOT_FINISHED_YET + + - id: GLACIAL_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Glacial Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 479b58ae7f0a10efbaebb4bac553b668623ca964d8da959a1d373fc6f0660fe6 + - id: NOT_FINISHED_YET + + - id: GLACIAL_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Glacial Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: f2ae6028a75441a5d3f718e574fb9ac7c310d4d7dc97ba56ba3d278d79e7ec23 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/greatspook.yml b/configuration/skyblock/items/accessories/greatspook.yml new file mode 100644 index 000000000..40e6369ae --- /dev/null +++ b/configuration/skyblock/items/accessories/greatspook.yml @@ -0,0 +1,39 @@ +items: + - id: GREAT_SPOOK_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + fear: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Great Spook Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: b83adf648d4e97de3b928a4e82d1169c1978d71e18757cbaee36627b9b0d3f2e + - id: NOT_FINISHED_YET + + - id: GREAT_SPOOK_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + fear: 4 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Great Spook Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 8566b0b75f9a173e8155007bdc3a3499874b17327d98645cde6d11a2255750c + - id: NOT_FINISHED_YET + + - id: GREAT_SPOOK_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + fear: 6 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Great Spook Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: a89cc1ede755709debb7d1fe7ab8129ac8901788d8d8613b03eac157c23cc49c + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/haste.yml b/configuration/skyblock/items/accessories/haste.yml new file mode 100644 index 000000000..421a53963 --- /dev/null +++ b/configuration/skyblock/items/accessories/haste.yml @@ -0,0 +1,28 @@ +items: + - id: HASTE_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + mining_speed: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Haste Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 174b0c35491b660fc9138868bbcb5f02b539cb56b7ab63d6c53a9af2f63d061a + - id: SELLABLE + value: 20500 + - id: NOT_FINISHED_YET + + - id: HASTE_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + mining_speed: 25 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Haste Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2fe7a882ffe0d0dd245d91bd8e6dcc1ed450ae13880b12276fbaf66d4a4164c9 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/healing.yml b/configuration/skyblock/items/accessories/healing.yml new file mode 100644 index 000000000..7ba36325c --- /dev/null +++ b/configuration/skyblock/items/accessories/healing.yml @@ -0,0 +1,29 @@ +items: + - id: HEALING_TALISMAN + material: PLAYER_HEAD + default_statistics: + vitality: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Healing Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 651eb16f22dd7505be5dae06671803633a5abf8b2beeb5c60548670df0e59214 + - id: SELLABLE + value: 1440 + - id: NOT_FINISHED_YET + + - id: HEALING_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + vitality: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Healing Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 50247bc4a01d2a2391cd8d8543c9fc673cda74b06bfc127a72ec06ad3ed580e1 + - id: SELLABLE + value: 17000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/hunter.yml b/configuration/skyblock/items/accessories/hunter.yml new file mode 100644 index 000000000..53f162dbc --- /dev/null +++ b/configuration/skyblock/items/accessories/hunter.yml @@ -0,0 +1,26 @@ +items: + - id: HUNTER_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + combat_wisdom: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Hunter Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5c577e7d31e5e04c2ce71e13e3962192d80bd54b55efaacaaea12966fe27bf9 + - id: NOT_FINISHED_YET + + - id: HUNTER_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + combat_wisdom: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Hunter Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5c577e7d31e5e04c2ce71e13e3962192d80bd54b55efaacaaea12966fe27bf9 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/intimidation.yml b/configuration/skyblock/items/accessories/intimidation.yml new file mode 100644 index 000000000..180421fd1 --- /dev/null +++ b/configuration/skyblock/items/accessories/intimidation.yml @@ -0,0 +1,45 @@ +items: + - id: INTIMIDATION_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Intimidation Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 68117c209b69eeaf2684816e16bed25e665008e7329632fdfca6523799cd7f71 + - id: SELLABLE + value: 200 + - id: NOT_FINISHED_YET + + - id: INTIMIDATION_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Intimidation Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 41fbc5010e8047ebc0bfd5b7635ab54772d8fd5a28099aeebc8ae2407f026b08 + - id: NOT_FINISHED_YET + + - id: INTIMIDATION_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Intimidation Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 96e977ae2f796dce6c80cb6bed9294e9ed4b11b88f9fde6c31f435dfd0382529 + - id: NOT_FINISHED_YET + + - id: INTIMIDATION_RELIC + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Intimidation Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: c066fd07683989e66bf752398c4861c71ae6fe228a493f2fdf427381650a1280 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/jerry.yml b/configuration/skyblock/items/accessories/jerry.yml new file mode 100644 index 000000000..272cff3e6 --- /dev/null +++ b/configuration/skyblock/items/accessories/jerry.yml @@ -0,0 +1,52 @@ +items: + - id: JERRY_TALISMAN_GREEN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + intelligence: -1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Green Jerry Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2567251d71b6f3a4dc03fa01e441de7edf9354794e74aec16c04f141ddf31c70 + - id: NOT_FINISHED_YET + + - id: JERRY_TALISMAN_BLUE + material: PLAYER_HEAD + rarity: RARE + default_statistics: + intelligence: -2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Blue Jerry Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: d3b919f040922eb17733b42d216b7cdefeaea366be14c1ae6993ca7e5909e0f0 + - id: NOT_FINISHED_YET + + - id: JERRY_TALISMAN_PURPLE + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + intelligence: -3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Purple Jerry Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: ff8bd61b60a425d2e0deb1df9665327750ceba822a0be85e2f4a3a722e20f7d6 + - id: NOT_FINISHED_YET + + - id: JERRY_TALISMAN_GOLDEN + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + intelligence: -4 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Golden Jerry Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7964f606fecc32451fbded1b6f5d4f22db8f018f7d8db78b122ca75f9d1c0574 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/junk.yml b/configuration/skyblock/items/accessories/junk.yml new file mode 100644 index 000000000..ca3892cff --- /dev/null +++ b/configuration/skyblock/items/accessories/junk.yml @@ -0,0 +1,39 @@ +items: + - id: JUNK_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + lore: + - '%%dark_gray%%%%italic%%One man''s trash is another man''s treasure.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Junk Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: d24c6d00c53b51685a6be7453d236228f9837f1c1e27a9175813983ca49c792f + - id: NOT_FINISHED_YET + + - id: JUNK_RING + material: PLAYER_HEAD + rarity: UNCOMMON + lore: + - '%%dark_gray%%%%italic%%One man''s trash is another man''s treasure.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Junk Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4c920d3593ed4936defc894b88c43a2bb0b50c3a1e9a6dd8e859cb27bd3cabd + - id: NOT_FINISHED_YET + + - id: JUNK_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + lore: + - '%%dark_gray%%%%italic%%One man''s trash is another man''s treasure.' + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Junk Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 9727812f708dee1826bceecdadb9c7719e3d0f385a3b2515d00b5f665d8ba83e + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/kuudracore.yml b/configuration/skyblock/items/accessories/kuudracore.yml new file mode 100644 index 000000000..45b64ba4a --- /dev/null +++ b/configuration/skyblock/items/accessories/kuudracore.yml @@ -0,0 +1,39 @@ +items: + - id: BURNING_KUUDRA_CORE + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Burning Kuudra Core + - id: ACCESSORY + - id: SKULL_HEAD + texture: 368743497820c08627d2cc5e891c0f9fc3793f75b6e41e140ac9b007d3b505a5 + - id: SELLABLE + value: 1 + - id: NOT_FINISHED_YET + + - id: FIERY_KUUDRA_CORE + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Fiery Kuudra Core + - id: ACCESSORY + - id: SKULL_HEAD + texture: 200c16738c372484628ca15cf7b0731b810bd3142e07c1053b5e3da6b6e523ca + - id: SELLABLE + value: 1 + - id: NOT_FINISHED_YET + + - id: INFERNAL_KUUDRA_CORE + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Infernal Kuudra Core + - id: ACCESSORY + - id: SKULL_HEAD + texture: ece252963a5188cef8ede9d8523bd91d284a785b418b39eec29a91aea07c61e2 + - id: SELLABLE + value: 1 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/lush.yml b/configuration/skyblock/items/accessories/lush.yml new file mode 100644 index 000000000..b1b2da660 --- /dev/null +++ b/configuration/skyblock/items/accessories/lush.yml @@ -0,0 +1,40 @@ +items: + - id: LUSH_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + health: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Lush Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 1f4f65d8a49eb5187218908cde43c589d113942ebc43c5d12eea7c81f359c769 + - id: NOT_FINISHED_YET + + - id: LUSH_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + health: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Lush Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: b34bd06e200478e453cd1ebcae047ae77a12bc30018313c2da49c2b068a695af + - id: NOT_FINISHED_YET + + - id: LUSH_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + health: 5 + health_regeneration: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Lush Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 39a9ce70dc163f3f069fc895860234cc9371ed693cbfa6e0eb4b48a9fe588c19 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/masterskull.yml b/configuration/skyblock/items/accessories/masterskull.yml new file mode 100644 index 000000000..2927cd7a8 --- /dev/null +++ b/configuration/skyblock/items/accessories/masterskull.yml @@ -0,0 +1,75 @@ +items: + - id: MASTER_SKULL_TIER_1 + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 1 + - id: ACCESSORY + - id: SKULL_HEAD + texture: 246d0d3d1069165a4523a858058a090c70b7429929abc869009cb6ebfcde7506 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_2 + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 2 + - id: ACCESSORY + - id: SKULL_HEAD + texture: 246d0d3d1069165a4523a858058a090c70b7429929abc869009cb6ebfcde7506 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_3 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 3 + - id: ACCESSORY + - id: SKULL_HEAD + texture: ba153afeda1f80cb382b5cc317175102a1d9fbd1d6c26c925433979a63565014 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_4 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 4 + - id: ACCESSORY + - id: SKULL_HEAD + texture: ba153afeda1f80cb382b5cc317175102a1d9fbd1d6c26c925433979a63565014 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_5 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 5 + - id: ACCESSORY + - id: SKULL_HEAD + texture: 910f9f1085d407141eb77617a4abdaaa08d8af33b960200fe8c126c1d1445682 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_6 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 6 + - id: ACCESSORY + - id: SKULL_HEAD + texture: a1ab5e3f875b101e929e88956d01835682d39db56780adeea37014d8ee476a65 + - id: NOT_FINISHED_YET + + - id: MASTER_SKULL_TIER_7 + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Master Skull - Tier 7 + - id: ACCESSORY + - id: SKULL_HEAD + texture: a04e47c43576f8d72ebabb458764affb588fc018262732e85149df9bbaab7767 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/mineral.yml b/configuration/skyblock/items/accessories/mineral.yml new file mode 100644 index 000000000..91e486322 --- /dev/null +++ b/configuration/skyblock/items/accessories/mineral.yml @@ -0,0 +1,26 @@ +items: + - id: MINERAL_TALISMAN + material: PLAYER_HEAD + rarity: RARE + default_statistics: + mining_fortune: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Mineral Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5ab7b04dbba61cc0e10907ca11f84f871b7aa234dde0e4f1ad8bbe4914fbc513 + - id: NOT_FINISHED_YET + + - id: GLOSSY_MINERAL_TALISMAN + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + mining_fortune: 6 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Glossy Mineral Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 53a26ad4620ddec27bc1d65f43cedc13315c783e1a5a3e3122c0ad458dad55c4 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/moonglade.yml b/configuration/skyblock/items/accessories/moonglade.yml new file mode 100644 index 000000000..e8a39de15 --- /dev/null +++ b/configuration/skyblock/items/accessories/moonglade.yml @@ -0,0 +1,48 @@ +items: + - id: MOONGLADE_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + fig_fortune: 5 + mangrove_fortune: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Moonglade Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 42945ce8eaaae7e8ff07369654c48a7b7e02f0c01ded77ad4a7bd8891baa2896 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: MOONGLADE_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + fig_fortune: 10 + mangrove_fortune: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Moonglade Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4bdf35eb9367a3bcb70208e9ce8e47463810a48873df525f9e1bb3231fc5ef2d + - id: SELLABLE + value: 2000 + - id: NOT_FINISHED_YET + + - id: MOONGLADE_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + fig_fortune: 15 + mangrove_fortune: 15 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Moonglade Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: e49a23f05625bb010a838f9c6c0b05db192362bc48e85b0702f5d2861c269593 + - id: SELLABLE + value: 3000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/odger.yml b/configuration/skyblock/items/accessories/odger.yml new file mode 100644 index 000000000..9eb7629c0 --- /dev/null +++ b/configuration/skyblock/items/accessories/odger.yml @@ -0,0 +1,68 @@ +items: + - id: ODGERS_BRONZE_TOOTH + material: PLAYER_HEAD + rarity: COMMON + lore: + - '%%dark_gray%%%%italic%%A perfectly fine tooth, besides some wear and tear...' + default_statistics: + sea_creature_chance: 0.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Odger's Bronze Tooth + - id: ACCESSORY + - id: SKULL_HEAD + texture: accc4432efe08c88530ac084fea6526641a207d78e637e41f7a4e5dcfdaaa162 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: ODGERS_SILVER_TOOTH + material: PLAYER_HEAD + rarity: UNCOMMON + lore: + - '%%dark_gray%%%%italic%%A perfectly fine tooth, besides a broken chunk...' + default_statistics: + sea_creature_chance: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Odger's Silver Tooth + - id: ACCESSORY + - id: SKULL_HEAD + texture: c2d41b2279abce5fd626923b61e3ab98dce4972417289ee2b73214c0aaba841e + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: ODGERS_GOLD_TOOTH + material: PLAYER_HEAD + rarity: RARE + lore: + - '%%dark_gray%%%%italic%%A perfectly fine tooth, besides its weight...' + default_statistics: + sea_creature_chance: 1.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Odger's Gold Tooth + - id: ACCESSORY + - id: SKULL_HEAD + texture: 42024901024636f1c074e6562285f4cc9fd3da2885d4010cee52cc0696d2f96a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: ODGERS_DIAMOND_TOOTH + material: PLAYER_HEAD + rarity: EPIC + lore: + - '%%dark_gray%%%%italic%%A perfectly fine tooth, besides its radiant brightness...' + default_statistics: + sea_creature_chance: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Odger's Diamond Tooth + - id: ACCESSORY + - id: SKULL_HEAD + texture: a2680a28962e9ad2d4872d06fba2cc60824fbb2d0824e42d958575b7563884aa + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/personalcompactor.yml b/configuration/skyblock/items/accessories/personalcompactor.yml new file mode 100644 index 000000000..f2deb33c6 --- /dev/null +++ b/configuration/skyblock/items/accessories/personalcompactor.yml @@ -0,0 +1,40 @@ +items: + - id: PERSONAL_COMPACTOR_4000 + material: DROPPER + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Compactor 4000 + - id: ACCESSORY + - id: ENCHANTED + - id: NOT_FINISHED_YET + + - id: PERSONAL_COMPACTOR_5000 + material: DROPPER + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Compactor 5000 + - id: ACCESSORY + - id: ENCHANTED + - id: NOT_FINISHED_YET + + - id: PERSONAL_COMPACTOR_6000 + material: DROPPER + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Compactor 6000 + - id: ACCESSORY + - id: ENCHANTED + - id: NOT_FINISHED_YET + + - id: PERSONAL_COMPACTOR_7000 + material: DROPPER + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Compactor 7000 + - id: ACCESSORY + - id: ENCHANTED + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/personaldeletor.yml b/configuration/skyblock/items/accessories/personaldeletor.yml new file mode 100644 index 000000000..70e8f4885 --- /dev/null +++ b/configuration/skyblock/items/accessories/personaldeletor.yml @@ -0,0 +1,36 @@ +items: + - id: PERSONAL_DELETOR_4000 + material: DISPENSER + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Deletor 4000 + - id: ACCESSORY + - id: NOT_FINISHED_YET + + - id: PERSONAL_DELETOR_5000 + material: DISPENSER + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Deletor 5000 + - id: ACCESSORY + - id: NOT_FINISHED_YET + + - id: PERSONAL_DELETOR_6000 + material: DISPENSER + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Deletor 6000 + - id: ACCESSORY + - id: NOT_FINISHED_YET + + - id: PERSONAL_DELETOR_7000 + material: DISPENSER + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Personal Deletor 7000 + - id: ACCESSORY + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/pesthunter.yml b/configuration/skyblock/items/accessories/pesthunter.yml new file mode 100644 index 000000000..f0214e16e --- /dev/null +++ b/configuration/skyblock/items/accessories/pesthunter.yml @@ -0,0 +1,52 @@ +items: + - id: PESTHUNTER_BADGE + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + bonus_pest_chance: 20 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pesthunter Badge + - id: ACCESSORY + - id: SKULL_HEAD + texture: b4f1f0cf3adb4adc6b996ff9cb4e6d9d8912e0a5ab851c366c8bfbdaf8b2ef04 + - id: NOT_FINISHED_YET + + - id: PESTHUNTER_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + bonus_pest_chance: 40 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pesthunter Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 1d06b74d6bd02b795f7bcbf17ac3b77d3bc57b695a8d54a1770c76e84896c8f8 + - id: NOT_FINISHED_YET + + - id: PESTHUNTER_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + bonus_pest_chance: 60 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pesthunter Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: b3aefd8bca236d315920d53bea1fe4892c8f1f308d6d57630677f059a3b0293f + - id: NOT_FINISHED_YET + + - id: PESTHUNTER_RELIC + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + bonus_pest_chance: 80 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pesthunter Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7b36c204f50a11f7fe22c1d16e6a85777b24b4ad316140c666295721214d1310 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/piggy.yml b/configuration/skyblock/items/accessories/piggy.yml new file mode 100644 index 000000000..942b5bdaa --- /dev/null +++ b/configuration/skyblock/items/accessories/piggy.yml @@ -0,0 +1,39 @@ +items: + - id: PIGGY_BANK + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Piggy Bank + - id: ACCESSORY + - id: SKULL_HEAD + texture: 3298cd257027d67a1bb20f7a5bc328a3debb78a9dfbf1e1e92af2f23aa640d89 + - id: SELLABLE + value: 16000 + - id: NOT_FINISHED_YET + + - id: CRACKED_PIGGY_BANK + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Cracked Piggy Bank + - id: ACCESSORY + - id: SKULL_HEAD + texture: 14a7aac08593a1a0bc6666fe0aeedfb195d413fc9cf87c73f4a8c04da6418857 + - id: SELLABLE + value: 16000 + - id: NOT_FINISHED_YET + + - id: BROKEN_PIGGY_BANK + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Broken Piggy Bank + - id: ACCESSORY + - id: SKULL_HEAD + texture: b590207aeea2d8fc80194f2a109f5b1999c91ebd377dff01b9e7ebe091a3a419 + - id: SELLABLE + value: 16000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/potion.yml b/configuration/skyblock/items/accessories/potion.yml new file mode 100644 index 000000000..310abfa22 --- /dev/null +++ b/configuration/skyblock/items/accessories/potion.yml @@ -0,0 +1,38 @@ +items: + - id: POTION_AFFINITY_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Potion Affinity Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: d6a59f4abcf5516e50b5a9b1cf2f7eca78eaf0c07ffb254cd45131b169068a5a + - id: SELLABLE + value: 192 + - id: NOT_FINISHED_YET + + - id: RING_POTION_AFFINITY + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Potion Affinity Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 46b5cfdd804d76249e7c6946b1d9afa22e9bdc72149f682e71654aee885dffbb + - id: SELLABLE + value: 2100 + - id: NOT_FINISHED_YET + + - id: ARTIFACT_POTION_AFFINITY + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Potion Affinity Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 56f9119a1d1fb01bb97db89aeba56ff5ee112079e432a2b50fa3a80a8954db38 + - id: SELLABLE + value: 64000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/power.yml b/configuration/skyblock/items/accessories/power.yml new file mode 100644 index 000000000..fb845276e --- /dev/null +++ b/configuration/skyblock/items/accessories/power.yml @@ -0,0 +1,101 @@ +items: + - id: POWER_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Talisman of Power + - id: ACCESSORY + - id: SKULL_HEAD + texture: c6736fd95d3a6a4aaac46709a07aec7f1c38f0a3aae573e6f483388819412b65 + - id: GEMSTONE + gemstone_slots: + - gemstone: RUBY + coins: 50000 + - gemstone: AMBER + coins: 50000 + - id: NOT_FINISHED_YET + + - id: POWER_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Ring of Power + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4528fe5dbe02e1d8d12186e2af98be1334ca7d596b7021ef7f978c7088b235fc + - id: GEMSTONE + gemstone_slots: + - gemstone: RUBY + coins: 50000 + - gemstone: AMETHYST + coins: 50000 + - gemstone: JADE + coins: 50000 + - gemstone: AMBER + coins: 50000 + - id: NOT_FINISHED_YET + + - id: POWER_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Artifact of Power + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2b15c8645bbabc42352350b1c9d84af71966c4c56a86d03acd079ed57f3ead3f + - id: GEMSTONE + gemstone_slots: + - gemstone: JADE + coins: 50000 + - gemstone: AMBER + coins: 50000 + - gemstone: TOPAZ + coins: 50000 + - gemstone: SAPPHIRE + coins: 50000 + - gemstone: AMETHYST + coins: 50000 + - gemstone: JASPER + coins: 50000 + - gemstone: RUBY + coins: 50000 + - id: NOT_FINISHED_YET + + - id: POWER_RELIC + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Relic of Power + - id: ACCESSORY + - id: SKULL_HEAD + texture: d8fdc87023cff26356477f2e097a2de83b550d88a6f1a877da4f95c4db11567f + - id: GEMSTONE + gemstone_slots: + - gemstone: JADE + coins: 50000 + - gemstone: AMBER + coins: 50000 + - gemstone: TOPAZ + coins: 50000 + - gemstone: SAPPHIRE + coins: 50000 + - gemstone: AMETHYST + coins: 50000 + - gemstone: JASPER + coins: 50000 + - gemstone: RUBY + coins: 50000 + - gemstone: OPAL + coins: 50000 + - gemstone: ONYX + coins: 50000 + - gemstone: PERIDOT + coins: 50000 + - gemstone: CITRINE + coins: 50000 + - gemstone: AQUAMARINE + coins: 50000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/pressure.yml b/configuration/skyblock/items/accessories/pressure.yml new file mode 100644 index 000000000..820ec1e1b --- /dev/null +++ b/configuration/skyblock/items/accessories/pressure.yml @@ -0,0 +1,45 @@ +items: + - id: PRESSURE_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + pressure_resistance: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pressure Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4c84e82d57afdc4bfd26a3aedbd4bca7fddf0d9b9a06ed317ce0ff15afe1053c + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: PRESSURE_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + pressure_resistance: 20 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pressure Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: ed387797e8699db520d0cfcf2ac69270542f6fbba408d259b6d8a0e435efd3af + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: PRESSURE_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + pressure_resistance: 30 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Pressure Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: e76edf328d2f8e8b6532399c82461a4e4880753b6e9f926604884aecf0dd5d33 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/redclaw.yml b/configuration/skyblock/items/accessories/redclaw.yml new file mode 100644 index 000000000..c0bc0fd81 --- /dev/null +++ b/configuration/skyblock/items/accessories/redclaw.yml @@ -0,0 +1,39 @@ +items: + - id: RED_CLAW_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + critical_damage: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Red Claw Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 317b51e086f201448a4b45b0b91e97faf4d1739071480be6d5cab0a054512164 + - id: NOT_FINISHED_YET + + - id: RED_CLAW_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + critical_damage: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Red Claw Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 59d9b327ff82f6e109b8746c48bfb7f641e1552855493dd4118be24d5b02bc0a + - id: NOT_FINISHED_YET + + - id: RED_CLAW_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + critical_damage: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Red Claw Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: caf59b8aa0f83546ef0d178ccf87e7ed88cf7858caae79b3633cbd75b650525f + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/respiration.yml b/configuration/skyblock/items/accessories/respiration.yml new file mode 100644 index 000000000..5fecba0d7 --- /dev/null +++ b/configuration/skyblock/items/accessories/respiration.yml @@ -0,0 +1,45 @@ +items: + - id: RESPIRATION_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + default_statistics: + respiration: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Respiration Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 76c62727dabd55df897c74094be1c51bb5d2d4ab6c4286df22f40830df5017f4 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: RESPIRATION_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + respiration: 20 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Respiration Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 1c28bdf6165b597a1b765692ab8cd02335254eb258bc5e91ce61836b56fecb90 + - id: SELLABLE + value: 2000 + - id: NOT_FINISHED_YET + + - id: RESPIRATION_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + respiration: 30 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Respiration Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 1af839c1bfaa88aefe65a0a799f4f32cf36667d9fe0e7f9fc200b33069726f78 + - id: SELLABLE + value: 3000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/runeblade.yml b/configuration/skyblock/items/accessories/runeblade.yml new file mode 100644 index 000000000..77fe7283e --- /dev/null +++ b/configuration/skyblock/items/accessories/runeblade.yml @@ -0,0 +1,39 @@ +items: + - id: RUNEBLADE_TALISMAN + material: PLAYER_HEAD + rarity: COMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Runeblade Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 5f7eefa4da751f08c04e817c89fa2571fefaa7bbbe69bcbd1788ce5f0f08beed + - id: SELLABLE + value: 100 + - id: NOT_FINISHED_YET + + - id: RUNEBLADE_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Runeblade Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: c4f6aa4ef624cf2d8149222b8e818cee3e0b00b341366d2560b319fa4d98708d + - id: SELLABLE + value: 900 + - id: NOT_FINISHED_YET + + - id: RUNEBLADE_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Runeblade Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 74332cd835d05bfca3f0ef445d82ca212cd910249cc7371653ab7b2970d1c0f3 + - id: SELLABLE + value: 8100 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/scarfs.yml b/configuration/skyblock/items/accessories/scarfs.yml index dd35bca3e..fc93ed27b 100644 --- a/configuration/skyblock/items/accessories/scarfs.yml +++ b/configuration/skyblock/items/accessories/scarfs.yml @@ -9,11 +9,10 @@ items: - "§7§7§oThe collection of his studies," - "§7§obeautiful handwriting!" components: - - id: TIERED_TALISMAN - base_tier: SCARFS_STUDIES - tier: 1 + - id: TALISMAN - id: SKULL_HEAD texture: 6de4ab129e137f9f4cbf7060318ee1748dc39da9b5d129a8da0e614e2337693 + - id: SCARFS_THESIS material: PLAYER_HEAD rarity: COMMON @@ -24,11 +23,10 @@ items: - "§7§7§oA research on how to preserve and" - "§7§oenhance class abilities in death." components: - - id: TIERED_TALISMAN - base_tier: SCARFS_STUDIES - tier: 2 + - id: TALISMAN - id: SKULL_HEAD texture: 8ce4c87eb4dde27459e3e7f85921e7e57b11199260caa5ce63f139ee3d188c + - id: SCARFS_GRIMOIRE material: PLAYER_HEAD rarity: COMMON @@ -40,8 +38,6 @@ items: - '§7§ohis favorite "Barrier" that his' - "§7§oProfessor taught him." components: - - id: TIERED_TALISMAN - base_tier: SCARFS_STUDIES - tier: 3 + - id: TALISMAN - id: SKULL_HEAD texture: bafb195cc75f31b619a077b7853653254ac18f220dc32d1412982ff437b4d57a diff --git a/configuration/skyblock/items/accessories/scavenger.yml b/configuration/skyblock/items/accessories/scavenger.yml new file mode 100644 index 000000000..ffc94383d --- /dev/null +++ b/configuration/skyblock/items/accessories/scavenger.yml @@ -0,0 +1,34 @@ +items: + - id: SCAVENGER_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Scavenger Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 211ab3a1132c9d1ef835ea81d972ed9b5cd8ddff0a07c55a749bcfcf8df5 + - id: SELLABLE + value: 200 + - id: NOT_FINISHED_YET + + - id: SCAVENGER_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Scavenger Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4c52a30ee53cf2b33a474625ffb5ccde4ec38871a42999db4e72b63089acf072 + - id: NOT_FINISHED_YET + + - id: SCAVENGER_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Scavenger Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2e011f648de37e49171e267252472b2130007e632db7358220ca546712f79a81 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/seacreatures.yml b/configuration/skyblock/items/accessories/seacreatures.yml new file mode 100644 index 000000000..a7a3c2185 --- /dev/null +++ b/configuration/skyblock/items/accessories/seacreatures.yml @@ -0,0 +1,44 @@ +items: + - id: SEA_CREATURE_TALISMAN + material: PLAYER_HEAD + default_statistics: + sea_creature_chance: 0.1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Sea Creature Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: eb7ae4dd0384543b31623ef19c1b3f886629424efae004b6ea75194ee9b9aa32 + - id: SELLABLE + value: 180 + - id: NOT_FINISHED_YET + + - id: SEA_CREATURE_RING + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + sea_creature_chance: 0.2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Sea Creature Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7ac01f28133c16b73567a77444e29a1475202d974ace29624cb688d2491b0b58 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: SEA_CREATURE_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + default_statistics: + sea_creature_chance: 0.3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Sea Creature Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: a4270c3655178afe44597b6394708828c292455365bddef971a381f41e47d5d0 + - id: SELLABLE + value: 25000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/seal.yml b/configuration/skyblock/items/accessories/seal.yml new file mode 100644 index 000000000..ee13ed1c0 --- /dev/null +++ b/configuration/skyblock/items/accessories/seal.yml @@ -0,0 +1,30 @@ +items: + - id: SEAL_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + sea_creature_chance: 0.5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Seal Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 872a8efa33090fa79929d568512ea2dd0e48c1bac6b185ba34fdeea07c01113b + - id: SELLABLE + value: 10000 + - id: NOT_FINISHED_YET + + - id: SEAL_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + sea_creature_chance: 1 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Seal Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 777d15363626bbdf43bc345ea20c42529074342028df572802b6ea386bc566a1 + - id: SELLABLE + value: 20000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/shark.yml b/configuration/skyblock/items/accessories/shark.yml new file mode 100644 index 000000000..879e42864 --- /dev/null +++ b/configuration/skyblock/items/accessories/shark.yml @@ -0,0 +1,64 @@ +items: + - id: RAGGEDY_SHARK_TOOTH_NECKLACE + material: PLAYER_HEAD + default_statistics: + strength: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Raggedy Shark Tooth Necklace + - id: ACCESSORY + - id: SKULL_HEAD + texture: d77309ddebbdc278ee2772d92fa4905dd850c5f213a77ffaed5a67eecb23984a + - id: NOT_FINISHED_YET + + - id: DULL_SHARK_TOOTH_NECKLACE + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + strength: 4 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Dull Shark Tooth Necklace + - id: ACCESSORY + - id: SKULL_HEAD + texture: f3ab3aa1ade74915dacd298613904361c18877eebfa81d9f936309f271e1389a + - id: NOT_FINISHED_YET + + - id: HONED_SHARK_TOOTH_NECKLACE + material: PLAYER_HEAD + rarity: RARE + default_statistics: + strength: 6 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Honed Shark Tooth Necklace + - id: ACCESSORY + - id: SKULL_HEAD + texture: e6b120938d83bf49ddab3a78666a0bf37a3de7b46b9d97b984da3be62ce3e5e3 + - id: NOT_FINISHED_YET + + - id: SHARP_SHARK_TOOTH_NECKLACE + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + strength: 8 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Sharp Shark Tooth Necklace + - id: ACCESSORY + - id: SKULL_HEAD + texture: 228e3fb6bd9887d60434ccd279ec3e59227826c9a2f8dd9ce9899ea6683d4ee8 + - id: NOT_FINISHED_YET + + - id: RAZOR_SHARP_SHARK_TOOTH_NECKLACE + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + strength: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Razor-sharp Shark Tooth Necklace + - id: ACCESSORY + - id: SKULL_HEAD + texture: 7792676664ac711488641f72b25961835613da9ffd43ea3bdd163cb365343a6 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/soulcampfire.yml b/configuration/skyblock/items/accessories/soulcampfire.yml new file mode 100644 index 000000000..9f74c98d9 --- /dev/null +++ b/configuration/skyblock/items/accessories/soulcampfire.yml @@ -0,0 +1,392 @@ +items: + - id: SOUL_CAMPFIRE_TALISMAN_1 + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Initiate Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 45c408adee23c607e8d183dfbe602b9fa562f36933722e3f7378498382425b88 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_2 + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Initiate Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 45c408adee23c607e8d183dfbe602b9fa562f36933722e3f7378498382425b88 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_3 + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Initiate Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 45c408adee23c607e8d183dfbe602b9fa562f36933722e3f7378498382425b88 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_4 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Adept Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: a51bd6265d0a2f9259f76194e6deaf07b10a412d5246c1d66847aa935fff2a6 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_5 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Adept Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: a51bd6265d0a2f9259f76194e6deaf07b10a412d5246c1d66847aa935fff2a6 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_6 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Adept Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: a51bd6265d0a2f9259f76194e6deaf07b10a412d5246c1d66847aa935fff2a6 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_7 + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Adept Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: a51bd6265d0a2f9259f76194e6deaf07b10a412d5246c1d66847aa935fff2a6 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_8 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Cultist Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: fac49359dc5d8aa9df02645365d3066800f0ffeaf57328f0b7e673aa56d0458a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_9 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Cultist Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: fac49359dc5d8aa9df02645365d3066800f0ffeaf57328f0b7e673aa56d0458a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_10 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Cultist Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: fac49359dc5d8aa9df02645365d3066800f0ffeaf57328f0b7e673aa56d0458a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_11 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Cultist Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: fac49359dc5d8aa9df02645365d3066800f0ffeaf57328f0b7e673aa56d0458a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_12 + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Cultist Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: fac49359dc5d8aa9df02645365d3066800f0ffeaf57328f0b7e673aa56d0458a + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_13 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_14 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_15 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_16 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_17 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_18 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge VI + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_19 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge VII + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_20 + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire Scion Badge VIII + - id: ACCESSORY + - id: SKULL_HEAD + texture: a823073ae1c2ee9d85818449572981773f7f6decefe3f9118db10d42911ef5d7 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_21 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 2 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge I + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_22 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 3 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge II + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_23 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 4 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge III + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_24 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 5 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge IV + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_25 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 6 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge V + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_26 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 7 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge VI + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_27 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 8 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge VII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_28 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 9 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge VIII + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET + + - id: SOUL_CAMPFIRE_TALISMAN_29 + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mending: 10 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soul Campfire God Badge IX + - id: ACCESSORY + - id: SKULL_HEAD + texture: 4106a4f22b5b523a269e59cab936d3221a7af987201838e1f806c00c133684a2 + - id: DEFAULT_SOULBOUND + coop_allowed: false + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/soulflow.yml b/configuration/skyblock/items/accessories/soulflow.yml new file mode 100644 index 000000000..0cdf5930e --- /dev/null +++ b/configuration/skyblock/items/accessories/soulflow.yml @@ -0,0 +1,35 @@ +items: + - id: SOULFLOW_PILE + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soulflow Pile + - id: ACCESSORY + - id: SKULL_HEAD + texture: 468c1fa4a21ba4f27dcb30ab3bfab0dc22a1e4fcf9ed12c1d7a70feb07f8d7ae + - id: SELLABLE + value: 160 + - id: NOT_FINISHED_YET + + - id: SOULFLOW_BATTERY + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soulflow Battery + - id: ACCESSORY + - id: SKULL_HEAD + texture: 468c1fa4a21ba4f27dcb30ab3bfab0dc22a1e4fcf9ed12c1d7a70feb07f8d7ae + - id: NOT_FINISHED_YET + + - id: SOULFLOW_SUPERCELL + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Soulflow Supercell + - id: ACCESSORY + - id: SKULL_HEAD + texture: 468c1fa4a21ba4f27dcb30ab3bfab0dc22a1e4fcf9ed12c1d7a70feb07f8d7ae + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/speed.yml b/configuration/skyblock/items/accessories/speed.yml index 1d6e35399..044e45b28 100644 --- a/configuration/skyblock/items/accessories/speed.yml +++ b/configuration/skyblock/items/accessories/speed.yml @@ -5,30 +5,26 @@ items: default_statistics: speed: 1.0 components: - - id: TIERED_TALISMAN - base_tier: SPEED_TALISMAN - tier: 1 + - id: TALISMAN - id: SKULL_HEAD texture: 8624bacb5f1986e6477abce4ae7dca1820a5260b6233b55ba1d9ba936c84b + - id: SPEED_RING material: PLAYER_HEAD rarity: COMMON default_statistics: speed: 3.0 components: - - id: TIERED_TALISMAN - base_tier: SPEED_TALISMAN - tier: 2 + - id: TALISMAN - id: SKULL_HEAD texture: c2da40a91f8fa7e1cbdd934da92a7668dc95d75b57c9c80a381c5e178cee6ba7 + - id: SPEED_ARTIFACT material: PLAYER_HEAD rarity: COMMON default_statistics: speed: 5.0 components: - - id: TIERED_TALISMAN - base_tier: SPEED_TALISMAN - tier: 3 + - id: TALISMAN - id: SKULL_HEAD texture: f06706eecb2d558ace27abda0b0b7b801d36d17dd7a890a9520dbe522374f8a6 diff --git a/configuration/skyblock/items/accessories/spider.yml b/configuration/skyblock/items/accessories/spider.yml index 595938889..fad164c5a 100644 --- a/configuration/skyblock/items/accessories/spider.yml +++ b/configuration/skyblock/items/accessories/spider.yml @@ -3,26 +3,22 @@ items: material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: SPIDER_TALISMAN - tier: 1 + - id: TALISMAN - id: SKULL_HEAD texture: 9d7e3b19ac4f3dee9c5677c135333b9d35a7f568b63d1ef4ada4b068b5a25 + - id: SPIDER_RING material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: SPIDER_TALISMAN - tier: 2 + - id: TALISMAN - id: SKULL_HEAD texture: 7652bd7617e56c756514f83c28dd1d96a7e5e167bf7fb593693fc65046f799 + - id: SPIDER_ARTIFACT material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: SPIDER_TALISMAN - tier: 3 + - id: TALISMAN - id: SKULL_HEAD texture: 8300986ed0a04ea79904f6ae53f49ed3a0ff5b1df62bba622ecbd3777f156df8 diff --git a/configuration/skyblock/items/accessories/titanium.yml b/configuration/skyblock/items/accessories/titanium.yml new file mode 100644 index 000000000..7d41b0c4b --- /dev/null +++ b/configuration/skyblock/items/accessories/titanium.yml @@ -0,0 +1,60 @@ +items: + - id: TITANIUM_TALISMAN + material: PLAYER_HEAD + rarity: UNCOMMON + default_statistics: + mining_speed: 15 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Titanium Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 10feda53576c8a6e57466f5dbdb99ea480ed122a09fdd850ed8c2e755f55cac2 + - id: SELLABLE + value: 51200 + - id: NOT_FINISHED_YET + + - id: TITANIUM_RING + material: PLAYER_HEAD + rarity: RARE + default_statistics: + mining_speed: 30 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Titanium Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: 2c3edd919c0cc6d9668ffd210e46d2c07fe088c44d85f47d251b4f87481174f5 + - id: SELLABLE + value: 2000 + - id: NOT_FINISHED_YET + + - id: TITANIUM_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + default_statistics: + mining_speed: 45 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Titanium Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 98ec21d20f1aaf5635f48beda88626403c6385b81673fb7cfa7ff82179c63e39 + - id: SELLABLE + value: 5000 + - id: NOT_FINISHED_YET + + - id: TITANIUM_RELIC + material: PLAYER_HEAD + rarity: LEGENDARY + default_statistics: + mining_speed: 60 + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Titanium Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: d2f2405a7b8defddb0b8268bea8f2e12fc09bbc7de12981f85db2a7001ac81eb + - id: SELLABLE + value: 10000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/treasure.yml b/configuration/skyblock/items/accessories/treasure.yml index c521b5277..7468b563f 100644 --- a/configuration/skyblock/items/accessories/treasure.yml +++ b/configuration/skyblock/items/accessories/treasure.yml @@ -3,26 +3,22 @@ items: material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: TREASURE_TALISMAN - tier: 1 + - id: TALISMAN - id: SKULL_HEAD texture: 31f320025142596396032cc0088e2ac36489f24cfa5e9dda13e081cf69f77f4d + - id: TREASURE_RING material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: TREASURE_TALISMAN - tier: 2 + - id: TALISMAN - id: SKULL_HEAD texture: 6a1cc5525a217a399b5b86c32f0f22dd91378874b5f44d5a383e18bc0f3bc301 + - id: TREASURE_ARTIFACT material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: TREASURE_TALISMAN - tier: 3 + - id: TALISMAN - id: SKULL_HEAD texture: e10f20a55b6e188ebe7578459b64a6fbd825067bc497b925ca43c2643d059025 diff --git a/configuration/skyblock/items/accessories/vaccine.yml b/configuration/skyblock/items/accessories/vaccine.yml new file mode 100644 index 000000000..5a10d2d48 --- /dev/null +++ b/configuration/skyblock/items/accessories/vaccine.yml @@ -0,0 +1,38 @@ +items: + - id: VACCINE_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Vaccine Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: 71408ede8b4f444015c59abd5cd32b8769de51881edabcc15abb6519f5b49 + - id: SELLABLE + value: 22 + - id: NOT_FINISHED_YET + + - id: VACCINE_RING + material: PLAYER_HEAD + rarity: UNCOMMON + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Vaccine Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: e48ee92b9ef1dd9f6083dab113fe1708fde4f4039ad2f85f06f317cefe49f3ad + - id: SELLABLE + value: 100 + - id: NOT_FINISHED_YET + + - id: VACCINE_ARTIFACT + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Vaccine Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: c4332067f9fa1695c3d577c3ef264355bee161b5e3a301906a4f443b002b92fa + - id: SELLABLE + value: 500 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/wither.yml b/configuration/skyblock/items/accessories/wither.yml new file mode 100644 index 000000000..c06730de4 --- /dev/null +++ b/configuration/skyblock/items/accessories/wither.yml @@ -0,0 +1,26 @@ +items: + - id: WITHER_ARTIFACT + material: PLAYER_HEAD + rarity: EPIC + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Wither Artifact + - id: ACCESSORY + - id: SKULL_HEAD + texture: 17b8ef7e8e0af19399cc32485f2ee47b2bb4d5802c71b3021f4d5d6b5f3afe03 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET + + - id: WITHER_RELIC + material: PLAYER_HEAD + rarity: LEGENDARY + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Wither Relic + - id: ACCESSORY + - id: SKULL_HEAD + texture: 17b8ef7e8e0af19399cc32485f2ee47b2bb4d5802c71b3021f4d5d6b5f3afe03 + - id: SELLABLE + value: 1000 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/wolf.yml b/configuration/skyblock/items/accessories/wolf.yml new file mode 100644 index 000000000..e4cce7bca --- /dev/null +++ b/configuration/skyblock/items/accessories/wolf.yml @@ -0,0 +1,25 @@ +items: + - id: WOLF_TALISMAN + material: PLAYER_HEAD + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Wolf Talisman + - id: ACCESSORY + - id: SKULL_HEAD + texture: f4cb7a6bf6c32c49f2589147e6f0f888e9e35875dd1ea2a8af379ca710589e6b + - id: SELLABLE + value: 50 + - id: NOT_FINISHED_YET + + - id: WOLF_RING + material: PLAYER_HEAD + rarity: RARE + components: + - id: CUSTOM_DISPLAY_NAME + display_name: Wolf Ring + - id: ACCESSORY + - id: SKULL_HEAD + texture: f83a2aa9d3734b919ac24c9659e5e0f86ecafbf64d4788cfa433bbec189e8 + - id: SELLABLE + value: 100 + - id: NOT_FINISHED_YET \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/zombie.yml b/configuration/skyblock/items/accessories/zombie.yml index a1c241ee9..35638e82c 100644 --- a/configuration/skyblock/items/accessories/zombie.yml +++ b/configuration/skyblock/items/accessories/zombie.yml @@ -3,24 +3,20 @@ items: material: ZOMBIE_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: ZOMBIE_TALISMAN - tier: 1 + - id: TALISMAN + - id: ZOMBIE_RING material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: ZOMBIE_TALISMAN - tier: 2 + - id: TALISMAN - id: SKULL_HEAD texture: 55d996cb5a8e5a71a274275f46944b944eeeacd2e1cadef918b05b879a03336f + - id: ZOMBIE_ARTIFACT material: PLAYER_HEAD rarity: COMMON components: - - id: TIERED_TALISMAN - base_tier: ZOMBIE_TALISMAN - tier: 3 + - id: TALISMAN - id: SKULL_HEAD texture: c3fb4e5db97f479c66a42bbd8a7d781daf201a8ddaf77afcf4aef87779aa8b4 diff --git a/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGrinder.java b/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGrinder.java index c728830e8..d5f942da0 100644 --- a/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGrinder.java +++ b/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGrinder.java @@ -3,7 +3,6 @@ import net.minestom.server.component.DataComponents; import net.minestom.server.event.inventory.InventoryCloseEvent; import net.minestom.server.event.inventory.InventoryPreClickEvent; -import net.minestom.server.inventory.Inventory; import net.minestom.server.inventory.InventoryType; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; diff --git a/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGuide.java b/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGuide.java index c1d54c8b7..4952fa7f2 100644 --- a/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGuide.java +++ b/type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/gui/GUIGemstoneGuide.java @@ -14,7 +14,6 @@ import net.swofty.type.skyblockgeneric.gems.Gemstone; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.GemstoneComponent; -import net.swofty.type.skyblockgeneric.item.components.TrackedUniqueComponent; import net.swofty.type.skyblockgeneric.item.updater.PlayerItemUpdater; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointAccessoryBag.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointAccessoryBag.java index dca53113c..c57ccb8a7 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointAccessoryBag.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/datapoints/DatapointAccessoryBag.java @@ -10,7 +10,7 @@ import net.swofty.commons.protocol.Serializer; import net.swofty.type.skyblockgeneric.data.SkyBlockDatapoint; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; -import net.swofty.type.skyblockgeneric.item.components.TieredTalismanComponent; +import net.swofty.type.skyblockgeneric.item.TieredTalismansRegistry; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; @@ -91,22 +91,36 @@ public List getAllAccessories() { public List getUniqueAccessories() { List accessories = new ArrayList<>(getAllAccessories()); - Map highestTierTalismans = new HashMap<>(); + Map highestTierTalismans = new HashMap<>(); + Map nonTieredAccessories = new HashMap<>(); for (SkyBlockItem accessory : accessories) { - if (accessory.hasComponent(TieredTalismanComponent.class)) { - TieredTalismanComponent currentTalisman = accessory.getComponent(TieredTalismanComponent.class); - ItemType baseTalisman = currentTalisman.getBaseTier(); - TieredTalismanComponent tieredTalisman = highestTierTalismans.containsKey(baseTalisman) ? highestTierTalismans.get(baseTalisman).getComponent(TieredTalismanComponent.class) : null; - - if (tieredTalisman == null || tieredTalisman.getTier() < currentTalisman.getTier()) { - highestTierTalismans.put(baseTalisman, accessory); + ItemType itemType = accessory.getAttributeHandler().getPotentialType(); + TieredTalismansRegistry talismanGroup = TieredTalismansRegistry.getTieredTalisman(itemType); + + if (talismanGroup != null) { + if (talismanGroup.isTiered()) { + SkyBlockItem currentBest = highestTierTalismans.get(talismanGroup); + ItemType currentBestType = currentBest != null ? currentBest.getAttributeHandler().getPotentialType() : null; + + int currentTier = currentBestType != null ? TieredTalismansRegistry.getTier(currentBestType) : -1; + int newTier = TieredTalismansRegistry.getTier(itemType); + + if (currentBest == null || newTier > currentTier) { + highestTierTalismans.put(talismanGroup, accessory); + } + } else { + nonTieredAccessories.put(itemType, accessory); } } else if (!accessory.isAir()) { - highestTierTalismans.put(accessory.getAttributeHandler().getPotentialType(), accessory); + nonTieredAccessories.put(itemType, accessory); } } - return List.copyOf(highestTierTalismans.values()); + + List result = new ArrayList<>(highestTierTalismans.values()); + result.addAll(nonTieredAccessories.values()); + + return result; } public List getUniqueAccessories(Rarity rarity) { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIAccessoryBag.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIAccessoryBag.java index 4bd7d21af..483f4cb69 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIAccessoryBag.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIAccessoryBag.java @@ -18,7 +18,6 @@ import net.swofty.type.skyblockgeneric.data.datapoints.DatapointAccessoryBag; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.components.AccessoryComponent; -import net.swofty.type.skyblockgeneric.item.components.TieredTalismanComponent; import net.swofty.type.skyblockgeneric.item.updater.PlayerItemUpdater; import net.swofty.type.skyblockgeneric.levels.SkyBlockLevelCause; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; @@ -222,7 +221,7 @@ public boolean isItemAllowed(SkyBlockItem item) { if (item.getMaterial().equals(Material.AIR)) return true; SkyBlockPlayer player = (SkyBlockPlayer) getPlayer(); - if (item.hasComponent(AccessoryComponent.class) || item.hasComponent(TieredTalismanComponent.class)) { + if (item.hasComponent(AccessoryComponent.class)) { DatapointAccessoryBag.PlayerAccessoryBag accessoryBag = player.getAccessoryBag(); accessoryBag.addDiscoveredAccessory(item.getAttributeHandler().getPotentialType()); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java index ab2ff7926..320bdc642 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java @@ -448,12 +448,6 @@ yield new EnchantableComponent( String handlerId = safeConfig.getString("handler_id"); yield new CustomStatisticsComponent(handlerId); } - case "TIERED_TALISMAN" -> { - String baseTierStr = safeConfig.getString("base_tier"); - ItemType baseTier = ItemType.valueOf(baseTierStr); - int tier = safeConfig.getInt("tier"); - yield new TieredTalismanComponent(baseTier, tier); - } case "TRACKED_UNIQUE" -> new TrackedUniqueComponent(); case "BREWING_INGREDIENT" -> { int brewingTime = safeConfig.getInt("brewing_time_seconds", 20); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/TieredTalismansRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/TieredTalismansRegistry.java new file mode 100644 index 000000000..07d44c6eb --- /dev/null +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/TieredTalismansRegistry.java @@ -0,0 +1,104 @@ +package net.swofty.type.skyblockgeneric.item; + +import lombok.Getter; +import net.swofty.commons.skyblock.item.ItemType; + +@Getter +public enum TieredTalismansRegistry { + SCARF(true, ItemType.SCARFS_STUDIES, ItemType.SCARFS_THESIS, ItemType.SCARFS_GRIMOIRE), + SPEED(true, ItemType.SPEED_TALISMAN, ItemType.SPEED_RING, ItemType.SPEED_ARTIFACT), + SPIDER(true, ItemType.SPIDER_TALISMAN, ItemType.SPIDER_RING, ItemType.SPIDER_ARTIFACT), + WOLF(true, ItemType.WOLF_TALISMAN, ItemType.WOLF_RING), + HEALING(true, ItemType.HEALING_TALISMAN, ItemType.HEALING_RING), + SCAVENGER(true, ItemType.SCAVENGER_TALISMAN, ItemType.SCAVENGER_RING, ItemType.SCAVENGER_ARTIFACT), + TREASURE(true, ItemType.TREASURE_TALISMAN, ItemType.TREASURE_RING, ItemType.TREASURE_ARTIFACT), + ZOMBIE(true, ItemType.ZOMBIE_TALISMAN, ItemType.ZOMBIE_RING, ItemType.ZOMBIE_ARTIFACT), + FISH_BOWL(true, ItemType.SMALL_FISH_BOWL, ItemType.MEDIUM_FISH_BOWL, ItemType.LARGE_FISH_BOWL), + RUNEBLADE(true, ItemType.RUNEBLADE_TALISMAN, ItemType.RUNEBLADE_RING, ItemType.RUNEBLADE_ARTIFACT), + EMERALD(true, ItemType.EMERALD_RING, ItemType.EMERALD_ARTIFACT), + WITHER(true, ItemType.WITHER_ARTIFACT, ItemType.WITHER_RELIC), + HASTE(true, ItemType.HASTE_RING, ItemType.HASTE_ARTIFACT), + PRESSURE(true, ItemType.PRESSURE_TALISMAN, ItemType.PRESSURE_RING, ItemType.PRESSURE_ARTIFACT), + EMPEROR(true, ItemType.EMPEROR_TALISMAN, ItemType.EMPEROR_RING, ItemType.EMPEROR_ARTIFACT), + MOONGLADE(true, ItemType.MOONGLADE_TALISMAN, ItemType.MOONGLADE_RING, ItemType.MOONGLADE_ARTIFACT), + RESPIRATION(true, ItemType.RESPIRATION_TALISMAN, ItemType.RESPIRATION_RING, ItemType.RESPIRATION_ARTIFACT), + DRACONIC(true, ItemType.DRACONIC_TALISMAN, ItemType.DRACONIC_RING, ItemType.DRACONIC_ARTIFACT), + BLOOD_DONOR(true, ItemType.BLOOD_DONOR_TALISMAN, ItemType.BLOOD_DONOR_RING, ItemType.BLOOD_DONOR_ARTIFACT), + AGARIMOO(true, ItemType.AGARIMOO_TALISMAN, ItemType.AGARIMOO_RING, ItemType.AGARIMOO_ARTIFACT), + LUSH(true, ItemType.LUSH_TALISMAN, ItemType.LUSH_RING, ItemType.LUSH_ARTIFACT), + GLACIAL(true, ItemType.GLACIAL_TALISMAN, ItemType.GLACIAL_RING, ItemType.GLACIAL_ARTIFACT), + GIFT(true, ItemType.WHITE_GIFT_TALISMAN, ItemType.GREEN_GIFT_TALISMAN, ItemType.BLUE_GIFT_TALISMAN, ItemType.PURPLE_GIFT_TALISMAN, ItemType.GOLD_GIFT_TALISMAN), + TITANIUM(true, ItemType.TITANIUM_TALISMAN, ItemType.TITANIUM_RING, ItemType.TITANIUM_ARTIFACT, ItemType.TITANIUM_RELIC), + PIGGY(false, ItemType.PIGGY_BANK, ItemType.CRACKED_PIGGY_BANK, ItemType.BROKEN_PIGGY_BANK), + ODGER(true, ItemType.ODGERS_BRONZE_TOOTH, ItemType.ODGERS_SILVER_TOOTH, ItemType.ODGERS_GOLD_TOOTH, ItemType.ODGERS_DIAMOND_TOOTH), + SEAL(true, ItemType.SEAL_TALISMAN, ItemType.SEAL_RING), + BINGO(true, ItemType.BINGO_TALISMAN, ItemType.BINGO_RING, ItemType.BINGO_ARTIFACT, ItemType.BINGO_RELIC), + SHARK(true, ItemType.RAGGEDY_SHARK_TOOTH_NECKLACE, ItemType.DULL_SHARK_TOOTH_NECKLACE, ItemType.HONED_SHARK_TOOTH_NECKLACE, ItemType.SHARP_SHARK_TOOTH_NECKLACE, ItemType.RAZOR_SHARP_SHARK_TOOTH_NECKLACE), + JERRY(true, ItemType.JERRY_TALISMAN_GREEN, ItemType.JERRY_TALISMAN_BLUE, ItemType.JERRY_TALISMAN_PURPLE, ItemType.JERRY_TALISMAN_GOLDEN), + PESTHUNTER(true, ItemType.PESTHUNTER_BADGE, ItemType.PESTHUNTER_RING, ItemType.PESTHUNTER_ARTIFACT, ItemType.PESTHUNTER_RELIC), + ANGUISH(true, ItemType.ANGUISH_TALISMAN, ItemType.ANGUISH_RING, ItemType.ANGUISH_ARTIFACT), + BEASTMASTER(true, ItemType.BEASTMASTER_CREST_COMMON, ItemType.BEASTMASTER_CREST_UNCOMMON, ItemType.BEASTMASTER_CREST_RARE, ItemType.BEASTMASTER_CREST_EPIC, ItemType.BEASTMASTER_CREST_LEGENDARY), + MINERAL(true, ItemType.MINERAL_TALISMAN, ItemType.GLOSSY_MINERAL_TALISMAN), + GREATSPOOK(true, ItemType.GREAT_SPOOK_TALISMAN, ItemType.GREAT_SPOOK_RING, ItemType.GREAT_SPOOK_ARTIFACT), + CHOCOLATE(true, ItemType.NIBBLE_CHOCOLATE_STICK, ItemType.SMOOTH_CHOCOLATE_BAR, ItemType.RICH_CHOCOLATE_CHUNK, ItemType.GANACHE_CHOCOLATE_SLAB, ItemType.PRESTIGE_CHOCOLATE_REALM), + CENTURY(true, ItemType.CENTURY_TALISMAN, ItemType.CENTURY_RING), + JUNK(true, ItemType.JUNK_TALISMAN, ItemType.JUNK_RING, ItemType.JUNK_ARTIFACT), + FROZEN_CHICKEN(true, ItemType.FROZEN_CHICKEN, ItemType.FRIED_FROZEN_CHICKEN), + ANITA(true, ItemType.ANITA_TALISMAN, ItemType.ANITA_RING, ItemType.ANITA_ARTIFACT), + GARDEN(true, ItemType.CROPIE_TALISMAN, ItemType.SQUASH_RING, ItemType.FERMENTO_ARTIFACT, ItemType.HELIANTHUS_RELIC), + BIOANALYSIS(true, ItemType.BIOANALYSIS_TALISMAN, ItemType.BIOANALYSIS_RING, ItemType.BIOANALYSIS_ARTIFACT), + POWER(true, ItemType.POWER_TALISMAN, ItemType.POWER_RING, ItemType.POWER_ARTIFACT, ItemType.POWER_RELIC), + RED_CLAW(true, ItemType.RED_CLAW_TALISMAN, ItemType.RED_CLAW_RING, ItemType.RED_CLAW_ARTIFACT), + HUNTER(true, ItemType.HUNTER_TALISMAN, ItemType.HUNTER_RING), + SOULFLOW(true, ItemType.SOULFLOW_PILE, ItemType.SOULFLOW_BATTERY, ItemType.SOULFLOW_SUPERCELL), + ENDER(true, ItemType.ENDER_ARTIFACT, ItemType.ENDER_RELIC), + BURSTSTOPPER(true, ItemType.BURSTSTOPPER_TALISMAN, ItemType.BURSTSTOPPER_ARTIFACT), + KUUDRA_CORE(true, ItemType.BURNING_KUUDRA_CORE, ItemType.FIERY_KUUDRA_CORE, ItemType.INFERNAL_KUUDRA_CORE), + POTION(true, ItemType.POTION_AFFINITY_TALISMAN, ItemType.RING_POTION_AFFINITY, ItemType.ARTIFACT_POTION_AFFINITY), + SEA_CREATURE(true, ItemType.SEA_CREATURE_TALISMAN, ItemType.SEA_CREATURE_RING, ItemType.SEA_CREATURE_ARTIFACT), + VACCINE(true, ItemType.VACCINE_TALISMAN, ItemType.VACCINE_RING, ItemType.VACCINE_ARTIFACT), + BAT_PERSON(true, ItemType.BAT_PERSON_TALISMAN, ItemType.BAT_PERSON_RING, ItemType.BAT_PERSON_ARTIFACT), + CANDY(true, ItemType.CANDY_TALISMAN, ItemType.CANDY_RING, ItemType.CANDY_ARTIFACT), + CAT(true, ItemType.CAT_TALISMAN, ItemType.LYNX_TALISMAN, ItemType.CHEETAH_TALISMAN), + BAT(true, ItemType.BAT_TALISMAN, ItemType.BAT_RING, ItemType.BAT_ARTIFACT), + FEATHER(true, ItemType.FEATHER_TALISMAN, ItemType.FEATHER_RING, ItemType.FEATHER_ARTIFACT), + PERSONAL_COMPACTOR(true, ItemType.PERSONAL_COMPACTOR_4000, ItemType.PERSONAL_COMPACTOR_5000, ItemType.PERSONAL_COMPACTOR_6000, ItemType.PERSONAL_COMPACTOR_7000), + PERSONAL_DELETOR(true, ItemType.PERSONAL_DELETOR_4000, ItemType.PERSONAL_DELETOR_5000, ItemType.PERSONAL_DELETOR_6000, ItemType.PERSONAL_DELETOR_7000), + INTIMIDATION(true, ItemType.INTIMIDATION_TALISMAN, ItemType.INTIMIDATION_RING, ItemType.INTIMIDATION_ARTIFACT, ItemType.INTIMIDATION_RELIC), + COIN(true, ItemType.COIN_TALISMAN, ItemType.RING_OF_COINS, ItemType.ARTIFACT_OF_COINS, ItemType.RELIC_OF_COINS), + MASTER_SKULL(true, ItemType.MASTER_SKULL_TIER_1, ItemType.MASTER_SKULL_TIER_2, ItemType.MASTER_SKULL_TIER_3, ItemType.MASTER_SKULL_TIER_4, ItemType.MASTER_SKULL_TIER_5, ItemType.MASTER_SKULL_TIER_6, ItemType.MASTER_SKULL_TIER_7), + ABICASES(false, ItemType.ACTUALLY_BLUE_ABICASE, ItemType.BLUE_BUT_GREEN_ABICASE, ItemType.BLUE_BUT_RED_ABICASE, ItemType.BLUE_BUT_YELLOW_ABICASE, ItemType.LIGHTER_BLUE_ABICASE, ItemType.REZAR_ABICASE, ItemType.SUMSUNG_G3_ABICASE, ItemType.SUMSUNG_GG_ABICASE), + CAMPFIRE(true, ItemType.CAMPFIRE_TALISMAN_1, ItemType.CAMPFIRE_TALISMAN_2, ItemType.CAMPFIRE_TALISMAN_3, ItemType.CAMPFIRE_TALISMAN_4, ItemType.CAMPFIRE_TALISMAN_5, ItemType.CAMPFIRE_TALISMAN_6, ItemType.CAMPFIRE_TALISMAN_7, ItemType.CAMPFIRE_TALISMAN_8, ItemType.CAMPFIRE_TALISMAN_9, ItemType.CAMPFIRE_TALISMAN_10, ItemType.CAMPFIRE_TALISMAN_11, ItemType.CAMPFIRE_TALISMAN_12, ItemType.CAMPFIRE_TALISMAN_13, ItemType.CAMPFIRE_TALISMAN_14, ItemType.CAMPFIRE_TALISMAN_15, ItemType.CAMPFIRE_TALISMAN_16, ItemType.CAMPFIRE_TALISMAN_17, ItemType.CAMPFIRE_TALISMAN_18, ItemType.CAMPFIRE_TALISMAN_19, ItemType.CAMPFIRE_TALISMAN_20, ItemType.CAMPFIRE_TALISMAN_21, ItemType.CAMPFIRE_TALISMAN_22, ItemType.CAMPFIRE_TALISMAN_23, ItemType.CAMPFIRE_TALISMAN_24, ItemType.CAMPFIRE_TALISMAN_25, ItemType.CAMPFIRE_TALISMAN_26, ItemType.CAMPFIRE_TALISMAN_27, ItemType.CAMPFIRE_TALISMAN_28, ItemType.CAMPFIRE_TALISMAN_29), + SOUL_CAMPFIRE(true, ItemType.SOUL_CAMPFIRE_TALISMAN_1, ItemType.SOUL_CAMPFIRE_TALISMAN_2, ItemType.SOUL_CAMPFIRE_TALISMAN_3, ItemType.SOUL_CAMPFIRE_TALISMAN_4, ItemType.SOUL_CAMPFIRE_TALISMAN_5, ItemType.SOUL_CAMPFIRE_TALISMAN_6, ItemType.SOUL_CAMPFIRE_TALISMAN_7, ItemType.SOUL_CAMPFIRE_TALISMAN_8, ItemType.SOUL_CAMPFIRE_TALISMAN_9, ItemType.SOUL_CAMPFIRE_TALISMAN_10, ItemType.SOUL_CAMPFIRE_TALISMAN_11, ItemType.SOUL_CAMPFIRE_TALISMAN_12, ItemType.SOUL_CAMPFIRE_TALISMAN_13, ItemType.SOUL_CAMPFIRE_TALISMAN_14, ItemType.SOUL_CAMPFIRE_TALISMAN_15, ItemType.SOUL_CAMPFIRE_TALISMAN_16, ItemType.SOUL_CAMPFIRE_TALISMAN_17, ItemType.SOUL_CAMPFIRE_TALISMAN_18, ItemType.SOUL_CAMPFIRE_TALISMAN_19, ItemType.SOUL_CAMPFIRE_TALISMAN_20, ItemType.SOUL_CAMPFIRE_TALISMAN_21, ItemType.SOUL_CAMPFIRE_TALISMAN_22, ItemType.SOUL_CAMPFIRE_TALISMAN_23, ItemType.SOUL_CAMPFIRE_TALISMAN_24, ItemType.SOUL_CAMPFIRE_TALISMAN_25, ItemType.SOUL_CAMPFIRE_TALISMAN_26, ItemType.SOUL_CAMPFIRE_TALISMAN_27, ItemType.SOUL_CAMPFIRE_TALISMAN_28, ItemType.SOUL_CAMPFIRE_TALISMAN_29), + ; + + private final boolean tiered; + private final ItemType[] talismans; + + TieredTalismansRegistry(boolean tiered, ItemType... talismans) { + this.tiered = tiered; // true if the next talisman should have higher priority than the one before + this.talismans = talismans; + } + + public static int getTier(ItemType talisman) { + for (TieredTalismansRegistry tieredTalisman : TieredTalismansRegistry.values()) { + for (int i = 0; i < tieredTalisman.talismans.length; i++) { + if (tieredTalisman.talismans[i] == talisman) { + return tieredTalisman.isTiered() ? i : 0; + } + } + } + return -1; + } + + public static TieredTalismansRegistry getTieredTalisman(ItemType talisman) { + for (TieredTalismansRegistry tieredTalisman : TieredTalismansRegistry.values()) { + for (ItemType item : tieredTalisman.talismans) { + if (item == talisman) { + return tieredTalisman; + } + } + } + return null; + } +} \ No newline at end of file diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/TieredTalismanComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/TieredTalismanComponent.java deleted file mode 100644 index 3133b0b73..000000000 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/TieredTalismanComponent.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.swofty.type.skyblockgeneric.item.components; - -import lombok.Getter; -import net.swofty.commons.skyblock.item.ItemType; - -@Getter -public class TieredTalismanComponent extends AccessoryComponent { - private final ItemType baseTier; - private final int tier; - - public TieredTalismanComponent(ItemType baseTier, int tier) { - this.baseTier = baseTier; - this.tier = tier; - } -} \ No newline at end of file From 47fc7020f991f6db0eb5021fc24291f47ef2fc4e Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sun, 4 Jan 2026 17:02:58 +0100 Subject: [PATCH 2/3] updated collections --- .../commons/skyblock/item/ItemType.java | 14 +- .../skyblock/statistics/ItemStatistic.java | 4 +- configuration/skyblock/collections/combat.yml | 166 ++--- .../skyblock/collections/farming.yml | 610 ++++------------ .../skyblock/collections/fishing.yml | 95 ++- .../skyblock/collections/foraging.yml | 122 +--- configuration/skyblock/collections/mining.yml | 596 +++++---------- .../items/accessories/accessories.yml | 19 + .../skyblock/items/accessories/haste.yml | 19 + .../items/accessories/seacreatures.yml | 59 +- .../skyblock/items/accessories/speed.yml | 54 ++ .../skyblock/items/accessories/zombie.yml | 2 +- .../skyblock/items/armor/cheaptuxedo.yml | 6 +- .../skyblock/items/armor/eleganttuxedo.yml | 6 +- .../skyblock/items/armor/fancytuxedo.yml | 6 +- .../skyblock/items/armor/farmsuit.yml | 95 ++- .../skyblock/items/armor/leaflet.yml | 111 ++- .../skyblock/items/armor/mushroom.yml | 103 ++- .../skyblock/items/armor/prospecting.yml | 76 +- .../skyblock/items/armor/pumpkin.yml | 101 ++- configuration/skyblock/items/backpacks.yml | 118 ++- .../skyblock/items/combat/combat.yml | 46 +- .../{enchanted.yml => compactedItems.yml} | 681 ++++++++++++++---- configuration/skyblock/items/crimson.yml | 27 - configuration/skyblock/items/enchantment.yml | 20 + .../skyblock/items/farming/farming.yml | 34 +- configuration/skyblock/items/mining/fine.yml | 132 ++++ .../skyblock/items/mining/flawed.yml | 132 ++++ .../skyblock/items/mining/flawless.yml | 132 ++++ configuration/skyblock/items/minions.yml | 14 +- .../skyblock/items/miscellaneous/fuel.yml | 49 ++ .../skyblock/items/miscellaneous/shipping.yml | 45 ++ .../skyblock/items/miscellaneous/upgrade.yml | 88 +++ configuration/skyblock/items/weapons.yml | 57 ++ configuration/skyblock/reforges/awkward.yml | 4 +- configuration/skyblock/reforges/blended.yml | 4 +- configuration/skyblock/reforges/clean.yml | 2 +- configuration/skyblock/reforges/deadly.yml | 4 +- configuration/skyblock/reforges/epic.yml | 2 +- configuration/skyblock/reforges/fair.yml | 4 +- configuration/skyblock/reforges/fierce.yml | 4 +- configuration/skyblock/reforges/fine.yml | 4 +- configuration/skyblock/reforges/great.yml | 2 +- configuration/skyblock/reforges/hasty.yml | 2 +- configuration/skyblock/reforges/heavy.yml | 2 +- configuration/skyblock/reforges/hefty.yml | 2 +- configuration/skyblock/reforges/honored.yml | 2 +- configuration/skyblock/reforges/legendary.yml | 4 +- configuration/skyblock/reforges/light.yml | 4 +- configuration/skyblock/reforges/menacing.yml | 4 +- configuration/skyblock/reforges/mythic.yml | 2 +- configuration/skyblock/reforges/neat.yml | 4 +- configuration/skyblock/reforges/odd_bow.yml | 4 +- configuration/skyblock/reforges/odd_sword.yml | 4 +- configuration/skyblock/reforges/pure.yml | 4 +- configuration/skyblock/reforges/rapid.yml | 2 +- configuration/skyblock/reforges/rich_bow.yml | 4 +- .../skyblock/reforges/rich_sword.yml | 4 +- configuration/skyblock/reforges/rugged.yml | 2 +- configuration/skyblock/reforges/sharp.yml | 4 +- configuration/skyblock/reforges/soft.yml | 4 +- configuration/skyblock/reforges/spicy.yml | 4 +- configuration/skyblock/reforges/stained.yml | 2 +- configuration/skyblock/reforges/unreal.yml | 4 +- configuration/skyblock/skills/combat.yml | 120 +-- .../net/swofty/type/hub/gui/GUISeymour.java | 6 +- .../SkyBlockGenericLoader.java | 65 +- .../bazaar/BazaarCategories.java | 2 +- .../collection/CollectionLoader.java | 121 +--- .../enchantment/impl/EnchantmentCritical.java | 6 +- .../enchantment/impl/EnchantmentDrain.java | 2 +- .../type/skyblockgeneric/gems/Gemstone.java | 2 +- .../inventories/sbmenu/GUISkyBlockMenu.java | 3 +- .../sbmenu/GUISkyBlockProfile.java | 14 +- .../sbmenu/stats/GUICombatStats.java | 14 +- .../item/ItemConfigParser.java | 20 +- .../type/skyblockgeneric/item/ItemLore.java | 2 +- .../item/components/EnchantedComponent.java | 28 +- .../item/components/PetComponent.java | 8 +- .../minion/MinionRegistry.java | 2 +- .../potion/PotionEffectType.java | 10 +- .../tabmodules/AccountInformationModule.java | 8 +- .../user/statistics/PlayerStatistics.java | 4 +- .../TypeSkywarsConfiguratorLoader.java | 11 +- 84 files changed, 2632 insertions(+), 1753 deletions(-) rename configuration/skyblock/items/{enchanted.yml => compactedItems.yml} (61%) diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java index 1aa1bcb04..842c8502a 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java @@ -389,7 +389,7 @@ public enum ItemType { GOLD_MINION(Material.PLAYER_HEAD, Rarity.RARE), LAPIS_MINION(Material.PLAYER_HEAD, Rarity.RARE), REDSTONE_MINION(Material.PLAYER_HEAD, Rarity.RARE), - ENDSTONE_MINION(Material.PLAYER_HEAD, Rarity.RARE), + END_STONE_MINION(Material.PLAYER_HEAD, Rarity.RARE), ICE_MINION(Material.PLAYER_HEAD, Rarity.RARE), QUARTZ_MINION(Material.PLAYER_HEAD, Rarity.RARE), OBSIDIAN_MINION(Material.PLAYER_HEAD, Rarity.RARE), @@ -823,6 +823,10 @@ public enum ItemType { MINER_ARMOR_CHESTPLATE(Material.IRON_CHESTPLATE, Rarity.RARE), MINER_ARMOR_LEGGINGS(Material.IRON_LEGGINGS, Rarity.RARE), MINER_ARMOR_BOOTS(Material.IRON_BOOTS, Rarity.RARE), + MINER_OUTFIT_HELMET(Material.LEATHER_HELMET, Rarity.UNCOMMON), + MINER_OUTFIT_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.UNCOMMON), + MINER_OUTFIT_LEGGINGS(Material.LEATHER_LEGGINGS, Rarity.UNCOMMON), + MINER_OUTFIT_BOOTS(Material.LEATHER_BOOTS, Rarity.UNCOMMON), CHARLIE_TROUSERS(Material.LEATHER_LEGGINGS, Rarity.COMMON), KELLY_TSHIRT(Material.LEATHER_CHESTPLATE, Rarity.COMMON), @@ -1739,6 +1743,8 @@ public enum ItemType { HOPPER_MINECART(Material.HOPPER_MINECART, Rarity.COMMON), TNT_MINECART(Material.TNT_MINECART, Rarity.COMMON), FURNACE_MINECART(Material.FURNACE_MINECART, Rarity.COMMON), + FIREWORK_ROCKET(Material.FIREWORK_ROCKET, Rarity.COMMON), + MILK_BUCKET(Material.MILK_BUCKET, Rarity.COMMON), /** * Enchanted Items @@ -1746,11 +1752,12 @@ public enum ItemType { ENCHANTED_ACACIA_LOG(Material.ACACIA_LOG, Rarity.UNCOMMON), ENCHANTED_BAKED_POTATO(Material.BAKED_POTATO, Rarity.UNCOMMON), ENCHANTED_BIRCH_LOG(Material.BIRCH_LOG, Rarity.UNCOMMON), - ENCHANTED_SLIMEBALL(Material.SLIME_BALL, Rarity.UNCOMMON), + ENCHANTED_SLIME_BALL(Material.SLIME_BALL, Rarity.UNCOMMON), ENCHANTED_BLAZE_ROD(Material.BLAZE_ROD, Rarity.UNCOMMON), ENCHANTED_BLAZE_POWDER(Material.BLAZE_POWDER, Rarity.UNCOMMON), ENCHANTED_BONE(Material.BONE, Rarity.UNCOMMON), ENCHANTED_CARROT(Material.CARROT, Rarity.UNCOMMON), + ENCHANTED_CAKE(Material.CAKE, Rarity.UNCOMMON), ENCHANTED_CHARCOAL(Material.CHARCOAL, Rarity.UNCOMMON), ENCHANTED_COAL(Material.COAL, Rarity.UNCOMMON), ENCHANTED_COBBLESTONE(Material.COBBLESTONE, Rarity.UNCOMMON), @@ -1794,7 +1801,7 @@ public enum ItemType { ENCHANTED_MAGMA_CREAM(Material.MAGMA_CREAM, Rarity.UNCOMMON), ENCHANTED_BROWN_MUSHROOM_BLOCK(Material.BROWN_MUSHROOM_BLOCK, Rarity.RARE), ENCHANTED_CLAY(Material.CLAY_BALL, Rarity.UNCOMMON), - ENCHANTED_CLOWNFISH(Material.TROPICAL_FISH, Rarity.UNCOMMON), + ENCHANTED_TROPICAL_FISH(Material.TROPICAL_FISH, Rarity.UNCOMMON), ENCHANTED_COD(Material.COD, Rarity.UNCOMMON), ENCHANTED_COOKED_COD(Material.COOKED_COD, Rarity.RARE), ENCHANTED_MUTTON(Material.MUTTON, Rarity.UNCOMMON), @@ -1858,6 +1865,7 @@ public enum ItemType { ENCHANTED_RED_SAND(Material.RED_SAND, Rarity.UNCOMMON), ENCHANTED_RED_SAND_CUBE(Material.PLAYER_HEAD, Rarity.RARE), ENCHANTED_BONE_MEAL(Material.BONE_MEAL, Rarity.COMMON), + ENCHANTED_WHEAT(Material.WHEAT, Rarity.UNCOMMON), ; public final Material material; diff --git a/commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java b/commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java index a4403121d..2c9e75300 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java @@ -12,9 +12,9 @@ public enum ItemStatistic { DEFENSE("Defense", "§a", "§a", false, "❈"), STRENGTH("Strength", "§c", "§c", false, "❁"), INTELLIGENCE("Intelligence", "§a", "§b", false, "✎"), - CRIT_CHANCE("Crit Chance", "§c", "§9", + CRITICAL_CHANCE("Crit Chance", "§c", "§9", true, "☣", 30D, 1D), - CRIT_DAMAGE("Crit Damage", "§c", "§9", + CRITICAL_DAMAGE("Crit Damage", "§c", "§9", true, "☠", 50D, 1D), BONUS_ATTACK_SPEED("Bonus Attack Speed", "§c", "§e", true, "⚔"), ABILITY_DAMAGE("Ability Damage", "§c", "§c", true, "๑"), diff --git a/configuration/skyblock/collections/combat.yml b/configuration/skyblock/collections/combat.yml index a618ff932..762baad8b 100644 --- a/configuration/skyblock/collections/combat.yml +++ b/configuration/skyblock/collections/combat.yml @@ -8,10 +8,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: BLAZE_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -25,12 +24,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BLAZE_POWDER - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: BLAZE_ROD - amount: 2500 rewards: - type: XP @@ -46,12 +42,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BLAZE_ROD - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: ENCHANTED_BLAZE_POWDER - amount: 25000 rewards: - type: XP @@ -69,10 +62,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SPIDER_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -91,12 +83,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_STRING - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: STRING - amount: 2500 rewards: - type: XP @@ -135,15 +124,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENDERMAN_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_ENDER_PEARL - amount: 1000 rewards: - type: XP @@ -167,32 +158,25 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_EYE_OF_ENDER - amount: 15000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ABSOLUTE_ENDER_PEARL - amount: 25000 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: COMBAT - craftingMaterial: ASPECT_OF_THE_END - resultAmount: 1 - pattern: - - A - - A - - B - ingredients: - A: - type: ENCHANTED_EYE_OF_ENDER - amount: 16 - B: - type: ENCHANTED_DIAMOND - amount: 1 + unlockedItemType: ASPECT_OF_THE_END - amount: 50000 rewards: - type: XP @@ -205,10 +189,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SKELETON_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -229,12 +212,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BONE - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: BONE - amount: 5000 rewards: - type: XP @@ -260,12 +240,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BONE_BLOCK - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: ENCHANTED_BONE - itemType: CHILI_PEPPER rewards: - amount: 10 @@ -298,12 +275,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: STUFFED_CHILI_PEPPER - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: CHILI_PEPPER - amount: 5000 rewards: - type: XP @@ -326,10 +300,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: GHAST_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -343,6 +316,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_GHAST_TEAR - amount: 2500 rewards: - type: XP @@ -356,22 +332,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: NONE - craftingMaterial: SILVER_FANG - resultAmount: 1 - pattern: - - OAO - - AAA - - OAO - ingredients: - A: - type: ENCHANTED_GHAST_TEAR - amount: 5 - O: - type: AIR - amount: 1 + unlockedItemType: SILVER_FANG - amount: 10000 rewards: - type: XP @@ -389,10 +352,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CREEPER_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -408,12 +370,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GUNPOWDER - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: GUNPOWDER - amount: 2500 rewards: - type: XP @@ -427,6 +386,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_FIREWORK_ROCKET - amount: 10000 rewards: - type: XP @@ -449,10 +411,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: MAGMA_CUBE_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -463,12 +424,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MAGMA_CREAM - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: MAGMA_CREAM - amount: 2500 rewards: - type: XP @@ -494,12 +452,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: WHIPPED_MAGMA_CREAM - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: ENCHANTED_MAGMA_CREAM - itemType: ROTTEN_FLESH rewards: - amount: 50 @@ -507,10 +462,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ZOMBIE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -529,12 +483,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_ROTTEN_FLESH - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: ROTTEN_FLESH - amount: 2500 rewards: - type: XP @@ -545,22 +496,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: SLAYER - craftingMaterial: ZOMBIE_HEART - resultAmount: 1 - pattern: - - AAA - - AOA - - AAA - ingredients: - A: - type: ENCHANTED_ROTTEN_FLESH - amount: 32 - O: - type: AIR - amount: 1 + unlockedItemType: ZOMBIE_HEART - amount: 10000 rewards: - type: XP @@ -588,10 +526,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SLIME_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -615,12 +552,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: - unlockedItemType: ENCHANTED_SLIMEBALL - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: SLIME_BALL + unlockedItemType: ENCHANTED_SLIME_BALL - amount: 5000 rewards: - type: XP @@ -636,12 +570,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SLIME_BLOCK - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: ENCHANTED_SLIMEBALL - amount: 50000 rewards: - type: XP @@ -654,10 +585,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CAVE_SPIDER_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -673,12 +603,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SPIDER_EYE - isEnchantedRecipe: true - recipeType: COMBAT - craftingMaterial: SPIDER_EYE - amount: 2500 rewards: - type: XP @@ -700,6 +627,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_FERMENTED_SPIDER_EYE - amount: 25000 rewards: - type: XP diff --git a/configuration/skyblock/collections/farming.yml b/configuration/skyblock/collections/farming.yml index 8b8bcc60e..b04d3577a 100644 --- a/configuration/skyblock/collections/farming.yml +++ b/configuration/skyblock/collections/farming.yml @@ -8,10 +8,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: WHEAT_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -25,94 +24,37 @@ collections: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: FARM_SUIT_HELMET - resultAmount: 1 - pattern: - - AAA - - AOA - ingredients: - A: - type: HAY_BALE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: FARM_SUIT_CHESTPLATE - resultAmount: 1 - pattern: - - AOA - - AAA - - AAA - ingredients: - A: - type: HAY_BALE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: FARM_SUIT_LEGGINGS - resultAmount: 1 - pattern: - - AAA - - AOA - - AOA - ingredients: - A: - type: HAY_BALE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: FARM_SUIT_BOOTS - resultAmount: 1 - pattern: - - AOA - - AOA - ingredients: - A: - type: HAY_BALE - amount: 1 - O: - type: AIR - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: FARM_SUIT_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: FARM_SUIT_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: FARM_SUIT_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: FARM_SUIT_BOOTS - amount: 500 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: FARMING_TALISMAN - resultAmount: 1 - pattern: - - ABA - - BAB - - ABA - ingredients: - A: - type: WHEAT - amount: 8 - B: - type: WHEAT_SEEDS - amount: 1 + unlockedItemType: FARMING_TALISMAN - amount: 1000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_BREAD + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_WHEAT - amount: 2500 rewards: - type: XP @@ -123,12 +65,6 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK - data: - unlockedItemType: ENCHANTED_HAY_BALE - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_BREAD - amount: 15000 rewards: - type: XP @@ -149,6 +85,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_HAY_BALE - itemType: CARROT rewards: - amount: 100 @@ -156,10 +95,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CARROT_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -175,12 +113,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_CARROT - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: CARROT - amount: 5000 rewards: - type: XP @@ -196,12 +131,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GOLDEN_CARROT - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_CARROT - amount: 50000 rewards: - type: XP @@ -219,10 +151,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CACTUS_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -238,12 +169,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_CACTUS_GREEN - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: CACTUS_GREEN - amount: 2500 rewards: - type: XP @@ -264,12 +192,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_CACTUS - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_CACTUS_GREEN - amount: 50000 rewards: - type: XP @@ -282,10 +207,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: COCOA_BEANS_MINION - isMinionRecipes: true - amount: 200 rewards: - type: XP @@ -301,12 +225,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COCOA_BEANS - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: COCOA_BEANS - amount: 5000 rewards: - type: XP @@ -317,6 +238,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_COOKIE - amount: 20000 rewards: - type: XP @@ -359,12 +283,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_FEATHER - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: FEATHER - amount: 5000 rewards: - type: XP @@ -392,10 +313,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: COW_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -406,65 +326,33 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: SMALL_BACKPACK - resultAmount: 1 - pattern: - - AAA - - AOA - - AAA - ingredients: - A: - type: LEATHER - amount: 10 - O: - type: AIR - amount: 1 + unlockedItemType: SMALL_BACKPACK - amount: 1000 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RAW_BEEF - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: BEEF - amount: 2500 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: MEDIUM_BACKPACK - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: LEATHER - amount: 64 - B: - type: SMALL_BACKPACK - amount: 1 + unlockedItemType: MEDIUM_BACKPACK - amount: 5000 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_LEATHER - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: LEATHER - amount: 10000 rewards: - type: XP @@ -475,22 +363,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: LARGE_BACKPACK - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_LEATHER - amount: 2 - B: - type: MEDIUM_BACKPACK - amount: 1 + unlockedItemType: LARGE_BACKPACK - amount: 50000 rewards: - type: XP @@ -501,22 +376,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: GREATER_BACKPACK - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_LEATHER - amount: 4 - B: - type: LARGE_BACKPACK - amount: 1 + unlockedItemType: GREATER_BACKPACK - itemType: MELON_SLICE rewards: - amount: 250 @@ -524,10 +386,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: MELON_MINION - isMinionRecipes: true - amount: 500 rewards: - type: XP @@ -543,34 +404,25 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MELON - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: MELON_SLICE - amount: 15000 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GLISTERING_MELON - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: GLISTERING_MELON - amount: 25000 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MELON_BLOCK - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_MELON - amount: 50000 rewards: - type: XP @@ -593,10 +445,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: MUSHROOM_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -607,68 +458,18 @@ collections: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: MUSHROOM_HELMET - resultAmount: 1 - pattern: - - AAA - - AOA - ingredients: - A: - type: RED_MUSHROOM - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: MUSHROOM_CHESTPLATE - resultAmount: 1 - pattern: - - AOA - - AAA - - AAA - ingredients: - A: - type: RED_MUSHROOM - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: MUSHROOM_LEGGINGS - resultAmount: 1 - pattern: - - AAA - - AOA - - AOA - ingredients: - A: - type: RED_MUSHROOM - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: MUSHROOM_BOOTS - resultAmount: 1 - pattern: - - AOA - - AOA - ingredients: - A: - type: RED_MUSHROOM - amount: 1 - O: - type: AIR - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MUSHROOM_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: MUSHROOM_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: MUSHROOM_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: MUSHROOM_BOOTS - amount: 1000 rewards: - type: XP @@ -684,12 +485,12 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BROWN_MUSHROOM - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: BROWN_MUSHROOM + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_RED_MUSHROOM - amount: 10000 rewards: - type: XP @@ -700,12 +501,12 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BROWN_MUSHROOM_BLOCK - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_BROWN_MUSHROOM + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_RED_MUSHROOM_BLOCK - amount: 50000 rewards: - type: XP @@ -718,10 +519,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SHEEP_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -742,12 +542,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MUTTON - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: MUTTON - amount: 5000 rewards: - type: XP @@ -763,12 +560,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COOKED_MUTTON - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_MUTTON - amount: 50000 rewards: - type: XP @@ -786,10 +580,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: NETHER_WART_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -808,12 +601,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_NETHER_WART - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: NETHER_WART - amount: 2500 rewards: - type: XP @@ -858,12 +648,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: MUTANT_NETHER_WART - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_NETHER_WART - amount: 250000 rewards: - type: XP @@ -879,10 +666,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: POTATO_MINION - isMinionRecipes: true - amount: 200 rewards: - type: XP @@ -898,12 +684,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_POTATO - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: POTATO - amount: 5000 rewards: - type: XP @@ -919,32 +702,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BAKED_POTATO - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_POTATO - amount: 50000 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: HOT_POTATO_BOOK - resultAmount: 1 - pattern: - - AA - - AB - ingredients: - A: - type: PAPER - amount: 1 - B: - type: ENCHANTED_BAKED_POTATO - amount: 1 + unlockedItemType: HOT_POTATO_BOOK - amount: 100000 rewards: - type: XP @@ -957,88 +725,34 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: PUMPKIN_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: PUMPKIN_HELMET - resultAmount: 1 - pattern: - - AAA - - AOA - ingredients: - A: - type: PUMPKIN - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: PUMPKIN_CHESTPLATE - resultAmount: 1 - pattern: - - AOA - - AAA - - AAA - ingredients: - A: - type: PUMPKIN - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: PUMPKIN_LEGGINGS - resultAmount: 1 - pattern: - - AAA - - AOA - - AOA - ingredients: - A: - type: PUMPKIN - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: PUMPKIN_BOOTS - resultAmount: 1 - pattern: - - AOA - - AOA - ingredients: - A: - type: PUMPKIN - amount: 1 - O: - type: AIR - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PUMPKIN_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: PUMPKIN_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: PUMPKIN_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: PUMPKIN_BOOTS - amount: 250 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_PUMPKIN - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: PUMPKIN - amount: 1000 rewards: - type: XP @@ -1077,12 +791,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: POLISHED_PUMPKIN - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_PUMPKIN - amount: 250000 rewards: - type: XP @@ -1095,10 +806,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CHICKEN_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1114,17 +824,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RAW_CHICKEN - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: CHICKEN - amount: 2500 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_EGG - amount: 5000 rewards: - type: XP @@ -1135,6 +845,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_CAKE - amount: 25000 rewards: - type: XP @@ -1145,11 +858,17 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SUPER_ENCHANTED_EGG - amount: 100000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: OMEGA_ENCHANTED_EGG - itemType: PORKCHOP rewards: - amount: 50 @@ -1157,10 +876,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: PIG_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1176,12 +894,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_PORK - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: PORKCHOP - amount: 2500 rewards: - type: XP @@ -1197,12 +912,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GRILLED_PORK - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_PORK - amount: 25000 rewards: - type: XP @@ -1220,10 +932,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: RABBIT_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1239,12 +950,12 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RABBIT_FOOT - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: RABBIT_FOOT + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_RAW_RABBIT - amount: 2500 rewards: - type: XP @@ -1258,12 +969,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RABBIT_HIDE - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: RABBIT_HIDE - amount: 10000 rewards: - type: XP @@ -1296,12 +1004,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SEEDS - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: WHEAT_SEEDS - amount: 1000 rewards: - type: XP @@ -1322,12 +1027,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: BOX_OF_SEEDS - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_SEEDS - itemType: SUGAR_CANE rewards: - amount: 100 @@ -1335,28 +1037,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SUGAR_CANE_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: SPEED_TALISMAN - resultAmount: 1 - pattern: - - AAA - - AAA - - AAA - ingredients: - A: - type: SUGAR_CANE - amount: 12 + unlockedItemType: SPEED_TALISMAN - amount: 500 rewards: - type: XP @@ -1367,33 +1058,20 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SUGAR - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: SUGAR - amount: 2000 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK + data: + unlockedItemType: SPEED_RING + - type: RECIPE_UNLOCK data: - recipeType: FARMING - craftingMaterial: SPEED_RING - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_SUGAR - amount: 12 - B: - type: SPEED_TALISMAN - amount: 1 + unlockedItemType: ENCHANTED_PAPER - amount: 5000 rewards: - type: XP @@ -1409,28 +1087,12 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SUGAR_CANE - isEnchantedRecipe: true - recipeType: FARMING - craftingMaterial: ENCHANTED_SUGAR - - type: RECIPE - data: - recipeType: FARMING - craftingMaterial: SPEED_ARTIFACT - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_SUGAR_CANE - amount: 6 - B: - type: SPEED_RING - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SPEED_ARTIFACT - amount: 50000 rewards: - type: XP diff --git a/configuration/skyblock/collections/fishing.yml b/configuration/skyblock/collections/fishing.yml index af2673989..26efeceeb 100644 --- a/configuration/skyblock/collections/fishing.yml +++ b/configuration/skyblock/collections/fishing.yml @@ -8,21 +8,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CLAY_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_CLAY - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: CLAY_BALL - amount: 250 rewards: - type: XP @@ -68,6 +64,9 @@ collections: - type: CUSTOM_AWARD data: customAward: SACK_OF_SACKS + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_TROPICAL_FISH - amount: 200 rewards: - type: XP @@ -125,6 +124,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_INK_SAC - amount: 200 rewards: - type: XP @@ -177,12 +179,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_LILY_PAD - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: LILY_PAD - amount: 500 rewards: - type: XP @@ -287,6 +286,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_PRISMARINE_CRYSTALS - amount: 100 rewards: - type: XP @@ -322,27 +324,17 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: NONE - craftingMaterial: PRISMARINE_BLADE - resultAmount: 1 - pattern: - - A - - A - - B - ingredients: - A: - type: PRISMARINE_SHARD - amount: 32 - B: - type: STICK - amount: 1 + unlockedItemType: PRISMARINE_BLADE - amount: 50 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_PRISMARINE_SHARD - amount: 100 rewards: - type: XP @@ -375,12 +367,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_PUFFERFISH - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: PUFFERFISH - amount: 100 rewards: - type: XP @@ -436,10 +425,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: FISHING_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -463,12 +451,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RAW_FISH - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: COD - amount: 2500 rewards: - type: XP @@ -482,12 +467,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COOKED_FISH - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: ENCHANTED_COD - amount: 30000 rewards: - type: XP @@ -534,12 +516,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RAW_SALMON - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: SALMON - amount: 500 rewards: - type: XP @@ -560,12 +539,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COOKED_SALMON - isEnchantedRecipe: true - recipeType: FISHING - craftingMaterial: ENCHANTED_RAW_SALMON - amount: 10000 rewards: - type: XP @@ -578,7 +554,7 @@ collections: - type: XP data: xp: 4 - - amount: 40 + - amount: 50 rewards: - type: XP data: @@ -588,31 +564,46 @@ collections: - type: XP data: xp: 4 - - amount: 200 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SEA_CREATURE_TALISMAN + - amount: 250 rewards: - type: XP data: xp: 4 - - amount: 400 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_SPONGE + - amount: 500 rewards: - type: XP data: xp: 4 - - amount: 800 + - amount: 1000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SEA_CREATURE_RING - amount: 1500 rewards: - type: XP data: xp: 4 - - amount: 2500 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_WET_SPONGE + - amount: 2000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SEA_CREATURE_ARTIFACT - amount: 4000 rewards: - type: XP diff --git a/configuration/skyblock/collections/foraging.yml b/configuration/skyblock/collections/foraging.yml index 2863d5053..16f089f22 100644 --- a/configuration/skyblock/collections/foraging.yml +++ b/configuration/skyblock/collections/foraging.yml @@ -8,10 +8,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: OAK_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -22,68 +21,18 @@ collections: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: FORAGING - craftingMaterial: LEAFLET_HELMET - resultAmount: 1 - pattern: - - AAA - - AOA - ingredients: - A: - type: OAK_LEAVES - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FORAGING - craftingMaterial: LEAFLET_LEGGINGS - resultAmount: 1 - pattern: - - AAA - - AOA - - AOA - ingredients: - A: - type: OAK_LEAVES - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FORAGING - craftingMaterial: LEAFLET_BOOTS - resultAmount: 1 - pattern: - - AOA - - AOA - ingredients: - A: - type: OAK_LEAVES - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: FORAGING - craftingMaterial: LEAFLET_CHESTPLATE - resultAmount: 1 - pattern: - - AOA - - AAA - - AAA - ingredients: - A: - type: OAK_LEAVES - amount: 1 - O: - type: AIR - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LEAFLET_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: LEAFLET_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: LEAFLET_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: LEAFLET_BOOTS - amount: 500 rewards: - type: XP @@ -99,12 +48,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_OAK_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: OAK_LOG - amount: 5000 rewards: - type: XP @@ -127,10 +73,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SPRUCE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -151,12 +96,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SPRUCE_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: SPRUCE_LOG - amount: 5000 rewards: - type: XP @@ -184,10 +126,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: BIRCH_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -213,12 +154,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_BIRCH_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: BIRCH_LOG - amount: 5000 rewards: - type: XP @@ -246,10 +184,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: JUNGLE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -275,12 +212,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_JUNGLE_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: JUNGLE_LOG - amount: 5000 rewards: - type: XP @@ -303,10 +237,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ACACIA_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -332,12 +265,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_ACACIA_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: ACACIA_LOG - amount: 5000 rewards: - type: XP @@ -360,10 +290,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: DARK_OAK_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -384,12 +313,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_DARK_OAK_LOG - isEnchantedRecipe: true - recipeType: FORAGING - craftingMaterial: DARK_OAK_LOG - amount: 5000 rewards: - type: XP diff --git a/configuration/skyblock/collections/mining.yml b/configuration/skyblock/collections/mining.yml index b0cdfe66b..dd5db7346 100644 --- a/configuration/skyblock/collections/mining.yml +++ b/configuration/skyblock/collections/mining.yml @@ -8,10 +8,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: COBBLESTONE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -22,57 +21,25 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: AUTO_SMELTER - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: COBBLESTONE - amount: 8 - B: - type: COAL - amount: 1 + unlockedItemType: AUTO_SMELTER - amount: 1000 rewards: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COBBLESTONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: COBBLESTONE - amount: 2500 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: COMPACTOR - resultAmount: 1 - pattern: - - AAA - - AOA - - ABA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 1 - B: - type: ENCHANTED_REDSTONE - amount: 1 - O: - type: AIR - amount: 1 + unlockedItemType: COMPACTOR - amount: 5000 rewards: - type: XP @@ -83,68 +50,18 @@ collections: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: MINING - craftingMaterial: MINERS_OUTFIT_BOOTS - resultAmount: 1 - pattern: - - AOA - - AOA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: MINING - craftingMaterial: MINERS_OUTFIT_CHESTPLATE - resultAmount: 1 - pattern: - - AOA - - AAA - - AAA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: MINING - craftingMaterial: MINERS_OUTFIT_HELMET - resultAmount: 1 - pattern: - - AAA - - AOA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 1 - O: - type: AIR - amount: 1 - - type: RECIPE - data: - recipeType: MINING - craftingMaterial: MINERS_OUTFIT_LEGGINGS - resultAmount: 1 - pattern: - - AAA - - AOA - - AOA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 1 - O: - type: AIR - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_BOOTS - amount: 25000 rewards: - type: XP @@ -155,46 +72,17 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: HASTE_RING - resultAmount: 1 - pattern: - - AAA - - AOA - - AAA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 16 - O: - type: AIR - amount: 1 + unlockedItemType: HASTE_RING - amount: 70000 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: SUPER_COMPACTOR_3000 - resultAmount: 1 - pattern: - - AAA - - AOA - - ABA - ingredients: - A: - type: ENCHANTED_COBBLESTONE - amount: 64 - B: - type: ENCHANTED_REDSTONE_BLOCK - amount: 1 - O: - type: AIR - amount: 1 + unlockedItemType: SUPER_COMPACTOR_3000 - itemType: COAL rewards: - amount: 50 @@ -202,10 +90,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: COAL_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -221,17 +108,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COAL - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: COAL - amount: 2500 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_CHARCOAL - amount: 5000 rewards: - type: XP @@ -242,35 +129,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COAL_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_COAL - amount: 25000 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: NONE - craftingMaterial: ENCHANTED_LAVA_BUCKET - resultAmount: 1 - pattern: - - ABA - - OAO - ingredients: - A: - type: ENCHANTED_IRON_INGOT - amount: 1 - B: - type: ENCHANTED_COAL_BLOCK - amount: 2 - O: - type: AIR - amount: 1 + unlockedItemType: ENCHANTED_LAVA_BUCKET - amount: 50000 rewards: - type: XP @@ -288,10 +157,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: GOLD_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -315,12 +183,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GOLD_INGOT - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: GOLD_INGOT - amount: 2500 rewards: - type: XP @@ -339,12 +204,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GOLD_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_GOLD_BLOCK - amount: 25000 rewards: - type: XP @@ -365,10 +227,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: LAPIS_MINION - isMinionRecipes: true - amount: 500 rewards: - type: XP @@ -387,12 +248,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_LAPIS_LAZULI - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: LAPIS_LAZULI - amount: 10000 rewards: - type: XP @@ -408,12 +266,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_LAPIS_LAZULI_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_LAPIS_LAZULI - amount: 100000 rewards: - type: XP @@ -436,10 +291,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: GRAVEL_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -463,12 +317,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_FLINT - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: FLINT - amount: 5000 rewards: - type: XP @@ -499,10 +350,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: DIAMOND_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -521,12 +371,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_DIAMOND - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: DIAMOND - amount: 2500 rewards: - type: XP @@ -540,22 +387,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: DIAMOND_SPREADING - resultAmount: 1 - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: VINES - amount: 1 - B: - type: ENCHANTED_DIAMOND - amount: 1 + unlockedItemType: DIAMOND_SPREADING - amount: 10000 rewards: - type: XP @@ -566,12 +400,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_DIAMOND_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_DIAMOND - amount: 50000 rewards: - type: XP @@ -584,10 +415,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: EMERALD_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -603,12 +433,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_EMERALD - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: EMERALD - amount: 5000 rewards: - type: XP @@ -624,12 +451,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_EMERALD_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_EMERALD - amount: 50000 rewards: - type: XP @@ -647,10 +471,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: - unlockedItemType: ENDSTONE_MINION - isMinionRecipes: true + unlockedItemType: END_STONE_MINION - amount: 100 rewards: - type: XP @@ -676,12 +499,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_END_STONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: END_STONE - amount: 10000 rewards: - type: XP @@ -714,12 +534,42 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: FLAWED_RUBY_GEM - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ROUGH_RUBY_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_JADE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_SAPPHIRE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_AMETHYST_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_AMBER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_TOPAZ_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_JASPER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_OPAL_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_ONYX_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_CITRINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_AQUAMARINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWED_PERIDOT_GEM - amount: 1000 rewards: - type: XP @@ -735,12 +585,42 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: FINE_RUBY_GEM - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: FLAWED_RUBY_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_JADE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_SAPPHIRE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_AMETHYST_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_AMBER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_TOPAZ_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_JASPER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_OPAL_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_ONYX_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_CITRINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_AQUAMARINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FINE_PERIDOT_GEM - amount: 25000 rewards: - type: XP @@ -761,12 +641,42 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: FLAWLESS_RUBY_GEM - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: FINE_RUBY_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_JADE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_SAPPHIRE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_AMETHYST_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_AMBER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_TOPAZ_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_JASPER_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_OPAL_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_ONYX_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_CITRINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_AQUAMARINE_GEM + - type: RECIPE_UNLOCK + data: + unlockedItemType: FLAWLESS_PERIDOT_GEM - amount: 1000000 rewards: - type: XP @@ -784,10 +694,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: GLOWSTONE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -798,12 +707,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GLOWSTONE_DUST - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: GLOWSTONE_DUST - amount: 2500 rewards: - type: XP @@ -814,17 +720,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_GLOWSTONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_GLOWSTONE_DUST - amount: 10000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_REDSTONE_LAMP - amount: 25000 rewards: - type: XP @@ -847,12 +753,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_HARD_STONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: HARD_STONE - amount: 50000 rewards: - type: XP @@ -868,12 +771,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: CONCENTRATED_STONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_HARD_STONE - amount: 1000000 rewards: - type: XP @@ -886,10 +786,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ICE_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -905,12 +804,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_ICE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: PACKED_ICE - amount: 1000 rewards: - type: XP @@ -926,12 +822,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_PACKED_ICE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_ICE - amount: 50000 rewards: - type: XP @@ -959,10 +852,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: IRON_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -981,36 +873,17 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_IRON_INGOT - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: IRON_INGOT - amount: 2500 rewards: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: BUDGET_HOPPER - resultAmount: 1 - pattern: - - AOA - - ABA - - OAO - ingredients: - A: - type: ENCHANTED_IRON_INGOT - amount: 1 - B: - type: CHEST - amount: 1 - O: - type: AIR - amount: 1 + unlockedItemType: BUDGET_HOPPER - amount: 5000 rewards: - type: XP @@ -1021,12 +894,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_IRON_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_IRON_INGOT - amount: 25000 rewards: - type: XP @@ -1037,25 +907,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE + - type: RECIPE_UNLOCK data: - recipeType: MINING - craftingMaterial: ENCHANTED_HOPPER - resultAmount: 1 - pattern: - - AOA - - ABA - - OAO - ingredients: - A: - type: ENCHANTED_IRON_BLOCK - amount: 1 - B: - type: CHEST - amount: 1 - O: - type: AIR - amount: 1 + unlockedItemType: ENCHANTED_HOPPER - amount: 100000 rewards: - type: XP @@ -1078,10 +932,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: MITHRIL_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -1092,12 +945,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MITHRIL - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: MITHRIL - amount: 2500 rewards: - type: XP @@ -1145,12 +995,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MYCELIUM - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: MYCELIUM - amount: 1000 rewards: - type: XP @@ -1171,12 +1018,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_MYCELIUM_CUBE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_MYCELIUM - amount: 25000 rewards: - type: XP @@ -1199,10 +1043,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: QUARTZ_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1218,12 +1061,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_QUARTZ - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: QUARTZ - amount: 2500 rewards: - type: XP @@ -1234,12 +1074,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_QUARTZ_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_QUARTZ - amount: 10000 rewards: - type: XP @@ -1277,12 +1114,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_NETHERRACK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: NETHERRACK - amount: 5000 rewards: - type: XP @@ -1295,10 +1129,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: OBSIDIAN_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1317,12 +1150,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_OBSIDIAN - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: OBSIDIAN - amount: 2500 rewards: - type: XP @@ -1365,12 +1195,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RED_SAND - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: RED_SAND - amount: 2500 rewards: - type: XP @@ -1381,12 +1208,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_RED_SAND_CUBE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_RED_SAND - amount: 15000 rewards: - type: XP @@ -1407,28 +1231,9 @@ collections: - type: XP data: xp: 4 - - type: RECIPE - data: - recipeType: NONE - craftingMaterial: EVERBURNING_FLAME - resultAmount: 1 - pattern: - - ABA - - CDC - - ABA - ingredients: - A: - type: FLAMES - amount: 4 - B: - type: ENCHANTED_RED_SAND_CUBE - amount: 1 - C: - type: ENCHANTED_SULPHUR_CUBE - amount: 1 - D: - type: PLASMA_BUCKET - amount: 1 + - type: RECIPE_UNLOCK + data: + unlockedItemType: EVERBURNING_FLAME - itemType: REDSTONE rewards: - amount: 100 @@ -1436,10 +1241,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: REDSTONE_MINION - isMinionRecipes: true - amount: 250 rewards: - type: XP @@ -1461,12 +1265,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_REDSTONE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: REDSTONE - amount: 3000 rewards: - type: XP @@ -1490,12 +1291,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_REDSTONE_BLOCK - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_REDSTONE - amount: 50000 rewards: - type: XP @@ -1567,10 +1365,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: SAND_MINION - isMinionRecipes: true - amount: 100 rewards: - type: XP @@ -1591,12 +1388,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SAND - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: SAND - amount: 2500 rewards: - type: XP @@ -1619,12 +1413,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SULPHUR - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: SULPHUR - amount: 2500 rewards: - type: XP @@ -1645,12 +1436,9 @@ collections: - type: XP data: xp: 4 - - type: SPECIAL_UNLOCK + - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_SULPHUR_CUBE - isEnchantedRecipe: true - recipeType: MINING - craftingMaterial: ENCHANTED_SULPHUR - amount: 25000 rewards: - type: XP @@ -1665,4 +1453,4 @@ collections: rewards: - type: XP data: - xp: 4 + xp: 4 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/accessories.yml b/configuration/skyblock/items/accessories/accessories.yml index 7c246f03c..fa61b8f19 100644 --- a/configuration/skyblock/items/accessories/accessories.yml +++ b/configuration/skyblock/items/accessories/accessories.yml @@ -16,6 +16,25 @@ items: - id: SKULL_HEAD texture: 9af328c87b068509aca9834eface197705fe5d4f0871731b7b21cd99b9fddc - id: TALISMAN + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - ABA + - BAB + - ABA + ingredients: + A: + type: WHEAT + amount: 8 + B: + type: WHEAT_SEEDS + amount: 1 + result: + type: FARMING_TALISMAN + amount: 1 - id: FIRE_TALISMAN material: PLAYER_HEAD diff --git a/configuration/skyblock/items/accessories/haste.yml b/configuration/skyblock/items/accessories/haste.yml index 421a53963..17f442f8b 100644 --- a/configuration/skyblock/items/accessories/haste.yml +++ b/configuration/skyblock/items/accessories/haste.yml @@ -13,6 +13,25 @@ items: - id: SELLABLE value: 20500 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - AAA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 16 + O: + type: AIR + amount: 1 + result: + type: HASTE_RING + amount: 1 - id: HASTE_ARTIFACT material: PLAYER_HEAD diff --git a/configuration/skyblock/items/accessories/seacreatures.yml b/configuration/skyblock/items/accessories/seacreatures.yml index a7a3c2185..d864c3294 100644 --- a/configuration/skyblock/items/accessories/seacreatures.yml +++ b/configuration/skyblock/items/accessories/seacreatures.yml @@ -12,6 +12,22 @@ items: - id: SELLABLE value: 180 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AAA + - AAA + ingredients: + A: + type: SPONGE + amount: 2 + result: + type: SEA_CREATURE_TALISMAN + amount: 1 - id: SEA_CREATURE_RING material: PLAYER_HEAD @@ -27,6 +43,28 @@ items: - id: SELLABLE value: 1000 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - ABA + - ACA + - ABA + ingredients: + A: + type: SPONGE + amount: 1 + B: + type: ENCHANTED_SPONGE + amount: 1 + c: + type: SEA_CREATURE_TALISMAN + amount: 1 + result: + type: SEA_CREATURE_RING + amount: 1 - id: SEA_CREATURE_ARTIFACT material: PLAYER_HEAD @@ -41,4 +79,23 @@ items: texture: a4270c3655178afe44597b6394708828c292455365bddef971a381f41e47d5d0 - id: SELLABLE value: 25000 - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_SPONGE + amount: 8 + B: + type: SEA_CREATURE_RING + amount: 1 + result: + type: SEA_CREATURE_ARTIFACT + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/speed.yml b/configuration/skyblock/items/accessories/speed.yml index 044e45b28..534fe1669 100644 --- a/configuration/skyblock/items/accessories/speed.yml +++ b/configuration/skyblock/items/accessories/speed.yml @@ -8,6 +8,22 @@ items: - id: TALISMAN - id: SKULL_HEAD texture: 8624bacb5f1986e6477abce4ae7dca1820a5260b6233b55ba1d9ba936c84b + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AAA + - AAA + ingredients: + A: + type: SUGAR_CANE + amount: 12 + result: + type: SPEED_TALISMAN + amount: 1 - id: SPEED_RING material: PLAYER_HEAD @@ -18,6 +34,25 @@ items: - id: TALISMAN - id: SKULL_HEAD texture: c2da40a91f8fa7e1cbdd934da92a7668dc95d75b57c9c80a381c5e178cee6ba7 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_SUGAR + amount: 12 + B: + type: SPEED_TALISMAN + amount: 1 + result: + type: SPEED_RING + amount: 1 - id: SPEED_ARTIFACT material: PLAYER_HEAD @@ -28,3 +63,22 @@ items: - id: TALISMAN - id: SKULL_HEAD texture: f06706eecb2d558ace27abda0b0b7b801d36d17dd7a890a9520dbe522374f8a6 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_SUGAR_CANE + amount: 6 + B: + type: SPEED_RING + amount: 1 + result: + type: SPEED_ARTIFACT + amount: 1 diff --git a/configuration/skyblock/items/accessories/zombie.yml b/configuration/skyblock/items/accessories/zombie.yml index 35638e82c..7e4a9e964 100644 --- a/configuration/skyblock/items/accessories/zombie.yml +++ b/configuration/skyblock/items/accessories/zombie.yml @@ -19,4 +19,4 @@ items: components: - id: TALISMAN - id: SKULL_HEAD - texture: c3fb4e5db97f479c66a42bbd8a7d781daf201a8ddaf77afcf4aef87779aa8b4 + texture: c3fb4e5db97f479c66a42bbd8a7d781daf201a8ddaf77afcf4aef87779aa8b4 \ No newline at end of file diff --git a/configuration/skyblock/items/armor/cheaptuxedo.yml b/configuration/skyblock/items/armor/cheaptuxedo.yml index 21287c42a..2dbd790df 100644 --- a/configuration/skyblock/items/armor/cheaptuxedo.yml +++ b/configuration/skyblock/items/armor/cheaptuxedo.yml @@ -2,7 +2,7 @@ items: - id: CHEAP_TUXEDO_BOOTS rarity: COMMON default_statistics: - crit_damage: 25.0 + CRITICAL_DAMAGE: 25.0 intelligence: 25.0 components: - id: STANDARD_ITEM @@ -16,7 +16,7 @@ items: - id: CHEAP_TUXEDO_CHESTPLATE rarity: COMMON default_statistics: - crit_damage: 50.0 + CRITICAL_DAMAGE: 50.0 intelligence: 50.0 components: - id: STANDARD_ITEM @@ -30,7 +30,7 @@ items: - id: CHEAP_TUXEDO_LEGGINGS rarity: COMMON default_statistics: - crit_damage: 25.0 + CRITICAL_DAMAGE: 25.0 intelligence: 25.0 components: - id: STANDARD_ITEM diff --git a/configuration/skyblock/items/armor/eleganttuxedo.yml b/configuration/skyblock/items/armor/eleganttuxedo.yml index f0a411fca..bf7bcf439 100644 --- a/configuration/skyblock/items/armor/eleganttuxedo.yml +++ b/configuration/skyblock/items/armor/eleganttuxedo.yml @@ -2,7 +2,7 @@ items: - id: ELEGANT_TUXEDO_BOOTS rarity: COMMON default_statistics: - crit_damage: 50.0 + CRITICAL_DAMAGE: 50.0 speed: 10.0 intelligence: 100.0 components: @@ -17,7 +17,7 @@ items: - id: ELEGANT_TUXEDO_CHESTPLATE rarity: COMMON default_statistics: - crit_damage: 100.0 + CRITICAL_DAMAGE: 100.0 intelligence: 300.0 components: - id: STANDARD_ITEM @@ -31,7 +31,7 @@ items: - id: ELEGANT_TUXEDO_LEGGINGS rarity: COMMON default_statistics: - crit_damage: 50.0 + CRITICAL_DAMAGE: 50.0 intelligence: 100.0 components: - id: STANDARD_ITEM diff --git a/configuration/skyblock/items/armor/fancytuxedo.yml b/configuration/skyblock/items/armor/fancytuxedo.yml index f3dcb5de3..b03b5abf8 100644 --- a/configuration/skyblock/items/armor/fancytuxedo.yml +++ b/configuration/skyblock/items/armor/fancytuxedo.yml @@ -2,7 +2,7 @@ items: - id: FANCY_TUXEDO_BOOTS rarity: COMMON default_statistics: - crit_damage: 35.0 + CRITICAL_DAMAGE: 35.0 speed: 10.0 intelligence: 75.0 components: @@ -17,7 +17,7 @@ items: - id: FANCY_TUXEDO_CHESTPLATE rarity: COMMON default_statistics: - crit_damage: 80.0 + CRITICAL_DAMAGE: 80.0 intelligence: 150.0 components: - id: STANDARD_ITEM @@ -31,7 +31,7 @@ items: - id: FANCY_TUXEDO_LEGGINGS rarity: COMMON default_statistics: - crit_damage: 35.0 + CRITICAL_DAMAGE: 35.0 intelligence: 75.0 components: - id: STANDARD_ITEM diff --git a/configuration/skyblock/items/armor/farmsuit.yml b/configuration/skyblock/items/armor/farmsuit.yml index 3c57b0b02..10078f722 100644 --- a/configuration/skyblock/items/armor/farmsuit.yml +++ b/configuration/skyblock/items/armor/farmsuit.yml @@ -1,19 +1,38 @@ items: - - id: FARM_SUIT_BOOTS + - id: FARM_SUIT_HELMET rarity: COMMON default_statistics: defense: 15.0 farming_fortune: 5.0 components: - id: STANDARD_ITEM - standard_item_type: BOOTS + standard_item_type: HELMET - id: LEATHER_COLOR r: '255' g: '255' b: '0' - id: SELLABLE - value: 20.0 + value: 25.0 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + ingredients: + A: + type: HAY_BALE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FARM_SUIT_HELMET + amount: 1 + - id: FARM_SUIT_CHESTPLATE rarity: COMMON default_statistics: @@ -29,33 +48,91 @@ items: - id: SELLABLE value: 40.0 - id: NOT_FINISHED_YET - - id: FARM_SUIT_HELMET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AAA + - AAA + ingredients: + A: + type: HAY_BALE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FARM_SUIT_CHESTPLATE + amount: 1 + + - id: FARM_SUIT_LEGGINGS rarity: COMMON default_statistics: defense: 15.0 farming_fortune: 5.0 components: - id: STANDARD_ITEM - standard_item_type: HELMET + standard_item_type: LEGGINGS - id: LEATHER_COLOR r: '255' g: '255' b: '0' - id: SELLABLE - value: 25.0 + value: 32.0 - id: NOT_FINISHED_YET - - id: FARM_SUIT_LEGGINGS + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + - AOA + ingredients: + A: + type: HAY_BALE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FARM_SUIT_LEGGINGS + amount: 1 + + - id: FARM_SUIT_BOOTS rarity: COMMON default_statistics: defense: 15.0 farming_fortune: 5.0 components: - id: STANDARD_ITEM - standard_item_type: LEGGINGS + standard_item_type: BOOTS - id: LEATHER_COLOR r: '255' g: '255' b: '0' - id: SELLABLE - value: 32.0 + value: 20.0 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AOA + ingredients: + A: + type: HAY_BALE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FARM_SUIT_BOOTS + amount: 1 diff --git a/configuration/skyblock/items/armor/leaflet.yml b/configuration/skyblock/items/armor/leaflet.yml index e49eef118..17a2cb1b0 100644 --- a/configuration/skyblock/items/armor/leaflet.yml +++ b/configuration/skyblock/items/armor/leaflet.yml @@ -1,19 +1,34 @@ items: - - id: LEAFLET_BOOTS + - id: LEAFLET_HELMET rarity: COMMON default_statistics: - health: 15.0 + health: 20.0 components: - id: STANDARD_ITEM - standard_item_type: BOOTS - - id: LEATHER_COLOR - r: '77' - g: '204' - b: '77' + standard_item_type: HELMET - id: SELLABLE value: 2.0 - id: CUSTOM_DISPLAY_NAME - display_name: Leaflet Sandals + display_name: Leaflet Hat + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FORAGING + pattern: + - AAA + - AOA + ingredients: + A: + type: OAK_LEAVES + amount: 1 + O: + type: AIR + amount: 1 + result: + type: LEAFLET_HELMET + amount: 1 + - id: LEAFLET_CHESTPLATE rarity: COMMON default_statistics: @@ -29,29 +44,91 @@ items: value: 4.0 - id: CUSTOM_DISPLAY_NAME display_name: Leaflet Tunic - - id: LEAFLET_HELMET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FORAGING + pattern: + - AOA + - AAA + - AAA + ingredients: + A: + type: OAK_LEAVES + amount: 1 + O: + type: AIR + amount: 1 + result: + type: LEAFLET_CHESTPLATE + amount: 1 + + - id: LEAFLET_LEGGINGS rarity: COMMON default_statistics: health: 20.0 components: - id: STANDARD_ITEM - standard_item_type: HELMET + standard_item_type: LEGGINGS + - id: LEATHER_COLOR + r: '77' + g: '204' + b: '77' - id: SELLABLE - value: 2.0 + value: 3.0 - id: CUSTOM_DISPLAY_NAME - display_name: Leaflet Hat - - id: LEAFLET_LEGGINGS + display_name: Leaflet Pants + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FORAGING + pattern: + - AAA + - AOA + - AOA + ingredients: + A: + type: OAK_LEAVES + amount: 1 + O: + type: AIR + amount: 1 + result: + type: LEAFLET_LEGGINGS + amount: 1 + + - id: LEAFLET_BOOTS rarity: COMMON default_statistics: - health: 20.0 + health: 15.0 components: - id: STANDARD_ITEM - standard_item_type: LEGGINGS + standard_item_type: BOOTS - id: LEATHER_COLOR r: '77' g: '204' b: '77' - id: SELLABLE - value: 3.0 + value: 2.0 - id: CUSTOM_DISPLAY_NAME - display_name: Leaflet Pants + display_name: Leaflet Sandals + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FORAGING + pattern: + - AOA + - AOA + ingredients: + A: + type: OAK_LEAVES + amount: 1 + O: + type: AIR + amount: 1 + result: + type: LEAFLET_BOOTS + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/armor/mushroom.yml b/configuration/skyblock/items/armor/mushroom.yml index 9257b3646..19541cdfe 100644 --- a/configuration/skyblock/items/armor/mushroom.yml +++ b/configuration/skyblock/items/armor/mushroom.yml @@ -1,18 +1,37 @@ items: - - id: MUSHROOM_BOOTS + - id: MUSHROOM_HELMET rarity: COMMON default_statistics: - health: 15.0 + health: 20.0 components: - id: NOT_FINISHED_YET - id: SELLABLE - value: 8.0 + value: 10.0 - id: STANDARD_ITEM - standard_item_type: BOOTS + standard_item_type: HELMET - id: LEATHER_COLOR r: '255' g: '0' b: '0' + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + ingredients: + A: + type: RED_MUSHROOM + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MUSHROOM_HELMET + amount: 1 + - id: MUSHROOM_CHESTPLATE rarity: COMMON default_statistics: @@ -28,32 +47,90 @@ items: r: '255' g: '0' b: '0' - - id: MUSHROOM_HELMET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AAA + - AAA + ingredients: + A: + type: RED_MUSHROOM + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MUSHROOM_CHESTPLATE + amount: 1 + + - id: MUSHROOM_LEGGINGS rarity: COMMON default_statistics: - health: 20.0 + health: 10.0 + defense: 5.0 components: - id: NOT_FINISHED_YET - id: SELLABLE - value: 10.0 + value: 14.0 - id: STANDARD_ITEM - standard_item_type: HELMET + standard_item_type: LEGGINGS - id: LEATHER_COLOR r: '255' g: '0' b: '0' - - id: MUSHROOM_LEGGINGS + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + - AOA + ingredients: + A: + type: RED_MUSHROOM + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MUSHROOM_LEGGINGS + amount: 1 + + - id: MUSHROOM_BOOTS rarity: COMMON default_statistics: - health: 10.0 - defense: 5.0 + health: 15.0 components: - id: NOT_FINISHED_YET - id: SELLABLE - value: 14.0 + value: 8.0 - id: STANDARD_ITEM - standard_item_type: LEGGINGS + standard_item_type: BOOTS - id: LEATHER_COLOR r: '255' g: '0' b: '0' + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AOA + ingredients: + A: + type: RED_MUSHROOM + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MUSHROOM_BOOTS + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/armor/prospecting.yml b/configuration/skyblock/items/armor/prospecting.yml index 9451cf32c..f8ea65743 100644 --- a/configuration/skyblock/items/armor/prospecting.yml +++ b/configuration/skyblock/items/armor/prospecting.yml @@ -21,6 +21,24 @@ items: g: '121' b: '100' - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MINER_OUTFIT_HELMET + amount: 1 - id: MINER_OUTFIT_CHESTPLATE material: LEATHER_CHESTPLATE @@ -44,6 +62,25 @@ items: g: '121' b: '100' - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AOA + - AAA + - AAA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MINER_OUTFIT_CHESTPLATE + amount: 1 - id: MINER_OUTFIT_LEGGINGS material: LEATHER_LEGGINGS @@ -67,6 +104,25 @@ items: g: '121' b: '100' - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - AOA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MINER_OUTFIT_LEGGINGS + amount: 1 - id: MINER_OUTFIT_BOOTS material: LEATHER_BOOTS @@ -89,4 +145,22 @@ items: r: '122' g: '121' b: '100' - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AOA + - AOA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: MINER_OUTFIT_BOOTS + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/armor/pumpkin.yml b/configuration/skyblock/items/armor/pumpkin.yml index 75ecd1e58..8d55aa94d 100644 --- a/configuration/skyblock/items/armor/pumpkin.yml +++ b/configuration/skyblock/items/armor/pumpkin.yml @@ -1,19 +1,38 @@ items: - - id: PUMPKIN_BOOTS + - id: PUMPKIN_HELMET rarity: COMMON default_statistics: defense: 8.0 health: 8.0 components: - id: STANDARD_ITEM - standard_item_type: BOOTS + standard_item_type: HELMET - id: LEATHER_COLOR r: '237' g: '170' b: '54' - id: SELLABLE - value: 8.0 + value: 10.0 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + ingredients: + A: + type: PUMPKIN + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PUMPKIN_HELMET + amount: 1 + - id: PUMPKIN_CHESTPLATE rarity: COMMON default_statistics: @@ -29,26 +48,66 @@ items: - id: SELLABLE value: 16.0 - id: NOT_FINISHED_YET - - id: PUMPKIN_HELMET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AAA + - AAA + ingredients: + A: + type: PUMPKIN + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PUMPKIN_CHESTPLATE + amount: 1 + + - id: PUMPKIN_LEGGINGS rarity: COMMON default_statistics: - defense: 8.0 - health: 8.0 + defense: 10.0 + health: 10.0 components: - id: STANDARD_ITEM - standard_item_type: HELMET + standard_item_type: BOOTS - id: LEATHER_COLOR r: '237' g: '170' b: '54' - id: SELLABLE - value: 10.0 + value: 14.0 - id: NOT_FINISHED_YET - - id: PUMPKIN_LEGGINGS + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + - AOA + ingredients: + A: + type: PUMPKIN + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PUMPKIN_LEGGINGS + amount: 1 + + - id: PUMPKIN_BOOTS rarity: COMMON default_statistics: - defense: 10.0 - health: 10.0 + defense: 8.0 + health: 8.0 components: - id: STANDARD_ITEM standard_item_type: BOOTS @@ -57,5 +116,23 @@ items: g: '170' b: '54' - id: SELLABLE - value: 14.0 + value: 8.0 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AOA + - AOA + ingredients: + A: + type: PUMPKIN + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PUMPKIN_BOOTS + amount: 1 diff --git a/configuration/skyblock/items/backpacks.yml b/configuration/skyblock/items/backpacks.yml index f7c4ae629..42ecc09ab 100644 --- a/configuration/skyblock/items/backpacks.yml +++ b/configuration/skyblock/items/backpacks.yml @@ -1,43 +1,123 @@ items: - - id: GREATER_BACKPACK + - id: SMALL_BACKPACK rarity: COMMON components: - id: BACKPACK - rows: 4 - skull-texture: 62f3b3a05481cde77240005c0ddcee1c069e5504a62ce0977879f55a39396146 - - id: JUMBO_BACKPACK + rows: 1 + skull-texture: 21d837ca222cbc0bc12426f5da018c3a931b406008800960a9df112a596e7d62 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + - AAA + ingredients: + A: + type: LEATHER + amount: 10 + O: + type: AIR + amount: 1 + result: + type: SMALL_BACKPACK + amount: 1 + + - id: MEDIUM_BACKPACK rarity: COMMON components: - id: BACKPACK - rows: 5 - skull-texture: 1f8405116c1daa7ce2f012591458d50246d0a467bcb95a5a2c033aefd6008b63 + rows: 2 + skull-texture: 62f3b3a05481cde77240005c0ddcee1c069e5504a62ce0977879f55a39396146 - id: DEFAULT_CRAFTABLE + default-craftable: false recipes: - - type: SHAPELESS - recipe-type: SPECIAL - result: - type: JUMBO_BACKPACK - amount: 1 + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA ingredients: - - type: GREATER_BACKPACK - amount: 1 - - type: JUMBO_BACKPACK_UPGRADE + A: + type: LEATHER + amount: 64 + B: + type: SMALL_BACKPACK amount: 1 + result: + type: MEDIUM_BACKPACK + amount: 1 + - id: LARGE_BACKPACK rarity: COMMON components: - id: BACKPACK rows: 3 skull-texture: 62f3b3a05481cde77240005c0ddcee1c069e5504a62ce0977879f55a39396146 - - id: MEDIUM_BACKPACK + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_LEATHER + amount: 2 + B: + type: MEDIUM_BACKPACK + amount: 1 + result: + type: LARGE_BACKPACK + amount: 1 + + - id: GREATER_BACKPACK rarity: COMMON components: - id: BACKPACK - rows: 2 + rows: 4 skull-texture: 62f3b3a05481cde77240005c0ddcee1c069e5504a62ce0977879f55a39396146 - - id: SMALL_BACKPACK + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_LEATHER + amount: 4 + B: + type: LARGE_BACKPACK + amount: 1 + result: + type: GREATER_BACKPACK + amount: 1 + + - id: JUMBO_BACKPACK rarity: COMMON components: - id: BACKPACK - rows: 1 - skull-texture: 21d837ca222cbc0bc12426f5da018c3a931b406008800960a9df112a596e7d62 + rows: 5 + skull-texture: 1f8405116c1daa7ce2f012591458d50246d0a467bcb95a5a2c033aefd6008b63 + - id: DEFAULT_CRAFTABLE + recipes: + - type: SHAPELESS + recipe-type: SPECIAL + result: + type: JUMBO_BACKPACK + amount: 1 + ingredients: + - type: GREATER_BACKPACK + amount: 1 + - type: JUMBO_BACKPACK_UPGRADE + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/combat/combat.yml b/configuration/skyblock/items/combat/combat.yml index 652714323..e1193fa00 100644 --- a/configuration/skyblock/items/combat/combat.yml +++ b/configuration/skyblock/items/combat/combat.yml @@ -1,12 +1,4 @@ items: - - id: ABSOLUTE_ENDER_PEARL - rarity: COMMON - components: - - id: ENCHANTED - - id: SELLABLE - value: 11200.0 - - id: SKULL_HEAD - texture: 67d9fe065024fff4b34c78f92cd3150d6bdfaab7c375a0ee785076e1a4a254e9 - id: CHILI_PEPPER rarity: COMMON components: @@ -14,28 +6,13 @@ items: value: 5000.0 - id: SKULL_HEAD texture: f859c8df1109c08a756275f1d2887c2748049fe33877769a7b415d56eda469d8 + - id: SOUL_STRING rarity: COMMON components: - id: SELLABLE value: 5000.0 - - id: STUFFED_CHILI_PEPPER - rarity: COMMON - components: - - id: ENCHANTED - recipe_type: COMBAT - - id: SELLABLE - value: 200000.0 - - id: SKULL_HEAD - texture: f599f959f0ebcb1eb0f2e5852d122ca55bf5258fd4613ab50d72ad8cf5e12603 - - id: WHIPPED_MAGMA_CREAM - rarity: COMMON - components: - - id: ENCHANTED - - id: SELLABLE - value: 204800.0 - - id: SKULL_HEAD - texture: 7da530ad09e69e4678c69cf5b8e0f0751e4630355fc7f0c226c955baace30fb2 + - id: ZOMBIE_HEART rarity: COMMON default_statistics: @@ -49,3 +26,22 @@ items: - id: TRACKED_UNIQUE - id: STANDARD_ITEM standard_item_type: HELMET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AOA + - AAA + ingredients: + A: + type: ENCHANTED_ROTTEN_FLESH + amount: 32 + O: + type: AIR + amount: 1 + result: + type: ZOMBIE_HEART + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/enchanted.yml b/configuration/skyblock/items/compactedItems.yml similarity index 61% rename from configuration/skyblock/items/enchanted.yml rename to configuration/skyblock/items/compactedItems.yml index c98988900..1b0646360 100644 --- a/configuration/skyblock/items/enchanted.yml +++ b/configuration/skyblock/items/compactedItems.yml @@ -1,51 +1,54 @@ items: - id: ENCHANTED_ACACIA_LOG - material: acacia_log + material: ACACIA_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: ACACIA_LOG - id: SELLABLE value: 320 - id: ENCHANTED_ANCIENT_CLAW - material: ancient_claw - rarity: UNCOMMON - default_statistics: {} - components: - - id: ENCHANTED - - - id: ENCHANTED_SLIMEBALL - material: ENCHANTED_SLIMEBALL + material: FLINT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: ANCIENT_CLAW - id: ENCHANTED_BAKED_POTATO - material: baked_potato + material: BAKED_POTATO rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_POTATO - id: SELLABLE value: 76800 - id: ENCHANTED_BIRCH_LOG - material: birch_log + material: BIRCH_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: BIRCH_LOG - id: SELLABLE value: 320 - id: ENCHANTED_BLAZE_POWDER - material: blaze_powder + material: BLAZE_POWDER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: BLAZE_ROD - id: SELLABLE value: 1440 - id: BREWING_INGREDIENT @@ -56,11 +59,13 @@ items: alchemy_xp: 500 - id: ENCHANTED_BLAZE_ROD - material: blaze_rod + material: BLAZE_ROD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: ENCHANTED_BLAZE_POWDER - id: SELLABLE value: 230400 - id: BREWING_INGREDIENT @@ -71,72 +76,88 @@ items: alchemy_xp: 23000 - id: ENCHANTED_BONE - material: bone + material: BONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: BONE - id: SELLABLE value: 320 - id: ENCHANTED_BONE_BLOCK - material: bone_block + material: BONE_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: ENCHANTED_BONE - id: ENCHANTED_BONE_MEAL - material: bone_meal + material: BONE_MEAL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: BONE_MEAL - id: SELLABLE value: 1 - id: ENCHANTED_BOOKSHELF - material: bookshelf + material: BOOKSHELF rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: BOOKSHELF - id: SELLABLE value: 2700 - id: ENCHANTED_BREAD - material: bread + material: BREAD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: BREAD - id: SELLABLE value: 60 - id: ENCHANTED_BROWN_MUSHROOM - material: brown_mushroom + material: BROWN_MUSHROOM rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: BROWN_MUSHROOM - id: SELLABLE value: 1600 - id: ENCHANTED_BROWN_MUSHROOM_BLOCK - material: brown_mushroom_block + material: BROWN_MUSHROOM_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: BROWN_MUSHROOM_BLOCK - id: SELLABLE value: 51200 - id: ENCHANTED_CACTUS - material: cactus + material: CACTUS rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: CACTUS - id: SELLABLE value: 76800 - id: BREWING_INGREDIENT @@ -147,11 +168,13 @@ items: alchemy_xp: 500 - id: ENCHANTED_CACTUS_GREEN - material: cactus_green + material: CACTUS_GREEN rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: CACTUS_GREEN - id: SELLABLE value: 480 - id: BREWING_INGREDIENT @@ -162,20 +185,46 @@ items: alchemy_xp: 250 - id: ENCHANTED_CARROT - material: carrot + material: CARROT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: CARROT - id: SELLABLE value: 480 - id: ENCHANTED_CAKE - material: cake - rarity: UNCOMMON - default_statistics: {} - components: - - id: ENCHANTED + material: CAKE + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipes: + - type: shaped + recipe-type: FARMING + result: + type: ENCHANTED_CAKE + amount: 1 + pattern: + - AAA + - BCB + - DDD + ingredients: + A: + type: MILK_BUCKET + amount: 1 + B: + type: ENCHANTED_SUGAR + amount: 1 + C: + type: ENCHANTED_EGG + amount: 1 + D: + type: WHEAT + amount: 1 + - id: SELLABLE value: 10000 - id: BREWING_INGREDIENT @@ -186,65 +235,97 @@ items: alchemy_xp: 400 - id: ENCHANTED_CHARCOAL - material: charcoal - rarity: UNCOMMON - default_statistics: {} - components: - - id: ENCHANTED + material: CHARCOAL + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipes: + - type: shaped + recipe-type: FORAGING + result: + type: ENCHANTED_CHARCOAL + amount: 1 + pattern: + - OAO + - ABA + - OAO + ingredients: + A: + type: COAL + amount: 32 + B: + type: OAK_LOG + amount: 32 + O: + type: AIR + amount: 1 - id: SELLABLE value: 320 - id: ENCHANTED_CLAY - material: clay + material: CLAY_BALL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: CLAY_BALL - id: SELLABLE value: 480 - - id: ENCHANTED_CLOWNFISH - material: clownfish + - id: ENCHANTED_TROPICAL_FISH + material: TROPICAL_FISH rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: TROPICAL_FISH - id: SELLABLE value: 3200 - id: ENCHANTED_COAL - material: coal + material: COAL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: COAL - id: SELLABLE value: 320 - id: ENCHANTED_COAL_BLOCK - material: coal_block + material: COAL_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: COAL_BLOCK - id: SELLABLE value: 51000 - id: ENCHANTED_COBBLESTONE - material: cobblestone + material: COBBLESTONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: COBBLESTONE - id: SELLABLE value: 160 - id: ENCHANTED_COCOA_BEANS - material: cocoa_beans + material: COCOA_BEANS rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: COCOA_BEANS - id: SELLABLE value: 480 - id: BREWING_INGREDIENT @@ -255,20 +336,24 @@ items: alchemy_xp: 300 - id: ENCHANTED_COOKED_FISH - material: cooked_fish + material: COOKED_COD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: ENCHANTED_RAW_FISH - id: SELLABLE value: 150000 - id: ENCHANTED_COOKED_MUTTON - material: cooked_mutton + material: COOKED_MUTTON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_MUTTON - id: SELLABLE value: 128000 - id: BREWING_INGREDIENT @@ -279,20 +364,42 @@ items: alchemy_xp: 15000 - id: ENCHANTED_COOKED_SALMON - material: cooked_salmon + material: COOKED_SALMON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: ENCHANTED_RAW_SALMON - id: SELLABLE value: 256000 - id: ENCHANTED_COOKIE - material: cookie - rarity: UNCOMMON - default_statistics: {} - components: - - id: ENCHANTED + material: COOKIE + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipes: + - type: shaped + recipe-type: FARMING + result: + type: ENCHANTED_COOKIE + amount: 1 + pattern: + - OAO + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_COCOA_BEANS + amount: 32 + B: + type: WHEAT + amount: 32 + O: + type: AIR + amount: 1 - id: SELLABLE value: 61500 - id: BREWING_INGREDIENT @@ -303,110 +410,134 @@ items: alchemy_xp: 12000 - id: ENCHANTED_DANDELION - material: dandelion + material: DANDELION rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: DANDELION - id: SELLABLE value: 160 - - id: DARK_OAK_LOG - material: dark_oak_log + - id: ENCHANTED_DARK_OAK_LOG + material: DARK_OAK_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: DARK_OAK_LOG - id: SELLABLE value: 320 - - id: DIAMOND - material: diamond + - id: ENCHANTED_DIAMOND + material: DIAMOND rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: DIAMOND - id: SELLABLE value: 1280 - id: ENCHANTED_DIAMOND_BLOCK - material: diamond_block + material: DIAMOND_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: DIAMOND_BLOCK - id: SELLABLE value: 204800 - id: ENCHANTED_EGG - material: egg + material: EGG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: EGG - id: SELLABLE value: 432 - id: ENCHANTED_EMERALD - material: emerald + material: EMERALD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: EMERALD - id: SELLABLE value: 960 - id: ENCHANTED_EMERALD_BLOCK - material: emerald_block + material: EMERALD_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: EMERALD_BLOCK - id: SELLABLE value: 153600 - id: ENCHANTED_ENDER_PEARL - material: ender_pearl + material: ENDER_PEARL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: ENDER_PEARL - id: SELLABLE value: 140 - id: ENCHANTED_END_STONE - material: end_stone + material: END_STONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: END_STONE - id: SELLABLE value: 320 - id: ENCHANTED_EYE_OF_ENDER - material: eye_of_ender + material: EYE_OF_ENDER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: EYE_OF_ENDER - id: SELLABLE value: 3520 - id: ENCHANTED_FEATHER - material: feather + material: FEATHER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: FEATHER - id: SELLABLE value: 480 - id: ENCHANTED_FERMENTED_SPIDER_EYE - material: fermented_spider_eye + material: FERMENTED_SPIDER_EYE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: FERMENTED_SPIDER_EYE - id: SELLABLE value: 31000 - id: BREWING_INGREDIENT @@ -417,16 +548,36 @@ items: alchemy_xp: 15000 - id: ENCHANTED_FIREWORK_ROCKET - material: firework_rocket - rarity: UNCOMMON + material: FIREWORK_ROCKET + rarity: RARE default_statistics: {} components: - id: ENCHANTED + recipes: + - type: shaped + recipe-type: COMBAT + result: + type: ENCHANTED_FIREWORK_ROCKET + amount: 1 + pattern: + - OAO + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_GUNPOWDER + amount: 16 + B: + type: PAPER + amount: 16 + O: + type: AIR + amount: 1 - id: SELLABLE value: 41000 - id: ENCHANTED_FLINT - material: flint + material: FLINT rarity: UNCOMMON default_statistics: {} components: @@ -437,11 +588,13 @@ items: value: 640 - id: ENCHANTED_GHAST_TEAR - material: ghast_tear + material: GHAST_TEAR rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: GHAST_TEAR - id: SELLABLE value: 80 - id: BREWING_INGREDIENT @@ -452,11 +605,13 @@ items: alchemy_xp: 100 - id: ENCHANTED_GLISTERING_MELON - material: glistering_melon + material: GLISTERING_MELON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: GLISTERING_MELON - id: SELLABLE value: 1000 - id: BREWING_INGREDIENT @@ -467,11 +622,13 @@ items: alchemy_xp: 500 - id: ENCHANTED_GLOWSTONE - material: glowstone + material: GLOWSTONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: GLOWSTONE - id: SELLABLE value: 51200 - id: BREWING_INGREDIENT @@ -482,11 +639,13 @@ items: alchemy_xp: 20 - id: ENCHANTED_GLOWSTONE_DUST - material: glowstone_dust + material: GLOWSTONE_DUST rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: GLOWSTONE_DUST - id: SELLABLE value: 320 - id: BREWING_INGREDIENT @@ -497,11 +656,13 @@ items: alchemy_xp: 10 - id: ENCHANTED_GOLD_INGOT - material: gold + material: GOLD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: GOLD_INGOT - id: SELLABLE value: 640 - id: BREWING_INGREDIENT @@ -512,11 +673,13 @@ items: alchemy_xp: 300 - id: ENCHANTED_GOLD_BLOCK - material: gold_block + material: GOLD_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: GOLD_BLOCK - id: SELLABLE value: 102000 - id: BREWING_INGREDIENT @@ -527,29 +690,35 @@ items: alchemy_xp: 15000 - id: ENCHANTED_GOLDEN_CARROT - material: golden_carrot + material: GOLDEN_CARROT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: GOLDEN_CARROT - id: SELLABLE value: 61440 - id: ENCHANTED_GRILLED_PORK - material: grilled_pork + material: COOKED_PORKCHOP rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_PORK - id: SELLABLE value: 128000 - id: ENCHANTED_GUNPOWDER - material: gunpowder + material: GUNPOWDER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: GUNPOWDER - id: SELLABLE value: 640 - id: BREWING_INGREDIENT @@ -560,118 +729,156 @@ items: alchemy_xp: 10 - id: ENCHANTED_HARD_STONE - material: hard_stone + material: HARD_STONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: HARD_STONE - id: SELLABLE value: 576 - id: ENCHANTED_HAY_BALE - material: hay_bale + material: HAY_BLOCK + rarity: RARE + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_WHEAT + - id: SELLABLE + value: 153600 + + - id: ENCHANTED_WHEAT + material: WHEAT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: WHEAT - id: SELLABLE - value: 7776 + value: 960 - id: ENCHANTED_ICE - material: ice + material: ICE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: ICE - id: SELLABLE value: 80 - id: ENCHANTED_INK_SAC - material: ink_sac + material: INK_SAC rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: INK_SAC - id: SELLABLE value: 160 - id: ENCHANTED_IRON_INGOT - material: iron + material: IRON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: IRON_INGOT - id: SELLABLE value: 480 - id: ENCHANTED_IRON_BLOCK - material: iron_block + material: IRON_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: IRON_BLOCK - id: SELLABLE value: 76800 + - id: ENCHANTED_JUNGLE_LOG - material: jungle_log + material: JUNGLE_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: JUNGLE_LOG - id: SELLABLE value: 320 - id: ENCHANTED_LAPIS_LAZULI - material: lapis_lazuli + material: LAPIS_LAZULI rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: LAPIS_LAZULI - id: SELLABLE value: 160 - id: ENCHANTED_LAPIS_LAZULI_BLOCK - material: lapis_lazuli_block + material: LAPIS_LAZULI_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: LAPIS_LAZULI_BLOCK - id: SELLABLE value: 25600 - id: ENCHANTED_LEATHER - material: leather + material: LEATHER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: LEATHER - id: SELLABLE value: 1700 - id: ENCHANTED_LILY_PAD - material: lily_pad + material: LILY_PAD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: LILY_PAD - id: SELLABLE value: 1600 - id: ENCHANTED_MAGMA_CREAM - material: magma_cream + material: MAGMA_CREAM rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: MAGMA_CREAM - id: SELLABLE value: 1280 - id: ENCHANTED_MELON - material: melon + material: MELON_SLICE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: MELON_SLICE - id: SELLABLE value: 320 - id: BREWING_INGREDIENT @@ -682,29 +889,35 @@ items: alchemy_xp: 250 - id: ENCHANTED_MELON_BLOCK - material: melon_block + material: MELON_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: MELON_BLOCK - id: SELLABLE value: 51200 - id: ENCHANTED_MITHRIL - material: mithril + material: MITHRIL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: MITHRIL - id: SELLABLE value: 1280 - id: ENCHANTED_MUTTON - material: mutton + material: MUTTON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: MUTTON - id: SELLABLE value: 800 - id: BREWING_INGREDIENT @@ -715,70 +928,84 @@ items: alchemy_xp: 300 - id: ENCHANTED_MYCELIUM - material: mycelium + material: MYCELIUM rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: MYCELIUM - id: SELLABLE value: 800 - id: ENCHANTED_NETHERRACK - material: netherrack + material: NETHERRACK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: NETHERRACK - id: SELLABLE value: 160 - id: ENCHANTED_NETHER_WART - material: nether_wart + material: NETHER_WART rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: NETHER_WART - id: SELLABLE value: 640 - id: ENCHANTED_OAK_LOG - material: oak_log + material: OAK_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: OAK_LOG - id: SELLABLE value: 320 - id: ENCHANTED_OBSIDIAN - material: obsidian + material: OBSIDIAN rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: OBSIDIAN - id: SELLABLE value: 1440 - id: ENCHANTED_PACKED_ICE - material: packed_ice + material: PACKED_ICE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: PACKED_ICE - id: SELLABLE value: 12800 - id: ENCHANTED_PAPER - material: paper + material: PAPER rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: PAPER - id: SELLABLE value: 384 - id: ENCHANTED_POISONOUS_POTATO - material: poisonous_potato + material: POISONOUS_POTATO rarity: UNCOMMON default_statistics: {} components: @@ -789,56 +1016,68 @@ items: value: 1600 - id: ENCHANTED_POPPY - material: poppy + material: POPPY rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: POPPY - id: SELLABLE value: 576 - id: ENCHANTED_PORK - material: pork + material: PORKCHOP rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: PORKCHOP - id: SELLABLE value: 800 - id: ENCHANTED_POTATO - material: potato + material: POTATO rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: POTATO - id: SELLABLE value: 480 - id: ENCHANTED_PRISMARINE_CRYSTALS - material: prismarine_crystals + material: PRISMARINE_CRYSTALS rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: PRISMARINE_CRYSTALS - id: SELLABLE value: 400 - id: ENCHANTED_PRISMARINE_SHARD - material: prismarine_shard + material: PRISMARINE_SHARD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: PRISMARINE_SHARD - id: SELLABLE value: 400 - id: ENCHANTED_PUFFERFISH - material: pufferfish + material: PUFFERFISH rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: PUFFERFISH - id: SELLABLE value: 2400 - id: BREWING_INGREDIENT @@ -849,38 +1088,46 @@ items: alchemy_xp: 600 - id: ENCHANTED_PUMPKIN - material: pumpkin + material: PUMPKIN rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: PUMPKIN - id: SELLABLE value: 1600 - id: ENCHANTED_QUARTZ - material: quartz + material: QUARTZ rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: QUARTZ - id: SELLABLE value: 640 - id: ENCHANTED_QUARTZ_BLOCK - material: quartz_block + material: QUARTZ_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: QUARTZ_BLOCK - id: SELLABLE value: 102400 - id: ENCHANTED_RABBIT_FOOT - material: rabbit_foot + material: RABBIT_FOOT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RABBIT_FOOT - id: SELLABLE value: 800 - id: BREWING_INGREDIENT @@ -891,92 +1138,112 @@ items: alchemy_xp: 600 - id: ENCHANTED_RABBIT_HIDE - material: rabbit_hide + material: RABBIT_HIDE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RABBIT_HIDE - id: SELLABLE value: 2880 - id: ENCHANTED_RAW_BEEF - material: raw_beef + material: RAW_BEEF rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RAW_BEEF - id: SELLABLE value: 640 - id: ENCHANTED_RAW_CHICKEN - material: raw_chicken + material: RAW_CHICKEN rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RAW_CHICKEN - id: SELLABLE value: 640 - id: ENCHANTED_RAW_FISH - material: raw_fish + material: COD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: COD - id: SELLABLE value: 960 - id: ENCHANTED_RAW_RABBIT - material: raw_rabbit + material: RABBIT rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RABBIT - id: SELLABLE value: 640 - id: ENCHANTED_RAW_SALMON - material: raw_salmon + material: SALMON rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: SALMON - id: SELLABLE value: 1600 - id: ENCHANTED_RED_MUSHROOM - material: red_mushroom + material: RED_MUSHROOM rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RED_MUSHROOM - id: SELLABLE value: 1600 - id: ENCHANTED_RED_MUSHROOM_BLOCK - material: red_mushroom_block + material: RED_MUSHROOM_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: RED_MUSHROOM_BLOCK - id: SELLABLE value: 51200 - id: ENCHANTED_RED_SAND - material: red_sand + material: RED_SAND rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: RED_SAND - id: SELLABLE value: 800 - id: ENCHANTED_REDSTONE - material: redstone + material: REDSTONE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: REDSTONE - id: SELLABLE value: 160 - id: BREWING_INGREDIENT @@ -987,11 +1254,13 @@ items: alchemy_xp: 10 - id: ENCHANTED_REDSTONE_BLOCK - material: redstone_block + material: REDSTONE_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: REDSTONE_BLOCK - id: SELLABLE value: 25600 - id: BREWING_INGREDIENT @@ -1002,11 +1271,13 @@ items: alchemy_xp: 20 - id: ENCHANTED_REDSTONE_LAMP - material: redstone_lamp + material: REDSTONE_LAMP rarity: RARE default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: REDSTONE_LAMP - id: SELLABLE value: 204800 - id: BREWING_INGREDIENT @@ -1017,20 +1288,24 @@ items: alchemy_xp: 30 - id: ENCHANTED_ROTTEN_FLESH - material: rotten_flesh + material: ROTTEN_FLESH rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: ROTTEN_FLESH - id: SELLABLE value: 320 - id: ENCHANTED_SAND - material: sand + material: SAND rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: SAND - id: SELLABLE value: 320 @@ -1040,11 +1315,13 @@ items: default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: WHEAT_SEEDS - id: SELLABLE value: 480 - id: ENCHANTED_SHARK_FIN - material: shark_fin + material: SHARK_FIN rarity: UNCOMMON default_statistics: {} components: @@ -1052,28 +1329,30 @@ items: recipe_type: FISHING item_id: SHARK_FIN - - id: ENCHANTED_SLIMEBALL + - id: ENCHANTED_SLIME_BALL material: SLIME_BALL rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: SLIME_BALL - id: SELLABLE value: 800 - id: ENCHANTED_SLIME_BLOCK - material: slime_block + material: SLIME_BLOCK rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED recipe_type: COMBAT - item_id: ENCHANTED_SLIMEBALL + item_id: ENCHANTED_SLIME_BALL - id: SELLABLE value: 128000 - id: ENCHANTED_SNOW_BLOCK - material: snow_block + material: SNOW_BLOCK rarity: UNCOMMON default_statistics: {} components: @@ -1084,11 +1363,13 @@ items: value: 600 - id: ENCHANTED_SPIDER_EYE - material: spider_eye + material: SPIDER_EYE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: SPIDER_EYE - id: SELLABLE value: 480 - id: BREWING_INGREDIENT @@ -1099,38 +1380,46 @@ items: alchemy_xp: 500 - id: ENCHANTED_SPONGE - material: sponge + material: SPONGE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: SPONGE - id: SELLABLE value: 2000 - id: ENCHANTED_SPRUCE_LOG - material: spruce_log + material: SPRUCE_LOG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FORAGING + item_id: SPRUCE_LOG - id: SELLABLE value: 320 - id: ENCHANTED_STRING - material: string + material: STRING rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: STRING - id: SELLABLE value: 576 - id: ENCHANTED_SUGAR - material: sugar + material: SUGAR rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: SUGAR_CANE - id: SELLABLE value: 640 - id: BREWING_INGREDIENT @@ -1141,11 +1430,13 @@ items: alchemy_xp: 300 - id: ENCHANTED_SUGAR_CANE - material: sugar_cane + material: SUGAR_CANE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_SUGAR - id: SELLABLE value: 102400 - id: BREWING_INGREDIENT @@ -1156,34 +1447,42 @@ items: alchemy_xp: 15000 - id: ENCHANTED_SULPHUR - material: sulphur + material: SULPHUR rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: COMBAT + item_id: SULPHUR - id: SELLABLE value: 1600 - id: ENCHANTED_TITANIUM - material: titanium + material: PLAYER_HEAD rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: MINING + item_id: TITANIUM - id: SELLABLE value: 3200 + - id: SKULL_HEAD + texture: 3dcc0ec9873f4f8d407ba0a0f983e257787772eaf8784e226a61c7f727ac9e26 - id: ENCHANTED_WET_SPONGE - material: wet_sponge + material: WET_SPONGE rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FISHING + item_id: WET_SPONGE - id: SELLABLE value: 80000 - id: ENCHANTED_WOOL - material: wool + material: WOOL rarity: UNCOMMON default_statistics: {} components: @@ -1194,18 +1493,120 @@ items: value: 320 - id: OMEGA_ENCHANTED_EGG - material: omega_egg + material: ENDERMITE_SPAWN_EGG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: SUPER_ENCHANTED_EGG - id: SELLABLE value: 432 - id: SUPER_ENCHANTED_EGG - material: super_egg + material: POLAR_BEAR_SPAWN_EGG rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_EGG + - id: STUFFED_CHILI_PEPPER + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: COMBAT + item_id: CHILI_PEPPER + - id: SELLABLE + value: 200000.0 + - id: SKULL_HEAD + texture: f599f959f0ebcb1eb0f2e5852d122ca55bf5258fd4613ab50d72ad8cf5e12603 + + - id: WHIPPED_MAGMA_CREAM + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: COMBAT + item_id: ENCHANTED_MAGMA_CREAM + - id: SELLABLE + value: 204800.0 + - id: SKULL_HEAD + texture: 7da530ad09e69e4678c69cf5b8e0f0751e4630355fc7f0c226c955baace30fb2 + + - id: ABSOLUTE_ENDER_PEARL + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: COMBAT + item_id: ENCHANTED_ENDER_PEARL + - id: SELLABLE + value: 11200.0 + - id: SKULL_HEAD + texture: 67d9fe065024fff4b34c78f92cd3150d6bdfaab7c375a0ee785076e1a4a254e9 + + - id: ENCHANTED_MYCELIUM_CUBE + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: MINING + item_id: ENCHANTED_MYCELIUM + - id: SELLABLE + value: 128000.0 + - id: SKULL_HEAD + texture: 9a351d5316e5b508fbbf595e0773aec9639a0891807fef09bc59a56d46490cb0 + + - id: ENCHANTED_RED_SAND_CUBE + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: MINING + item_id: ENCHANTED_RED_SAND + - id: SELLABLE + value: 128000.0 + - id: SKULL_HEAD + texture: f31f5c78b7e961591293756b9e15012db10457846c5ebc5db0f2b0e1873468ee + + - id: ENCHANTED_SULPHUR_CUBE + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: MINING + item_id: ENCHANTED_SULPHUR + - id: SELLABLE + value: 256000.0 + - id: SKULL_HEAD + texture: 4f0c28dfcf42d4dbd27c3378f67176c84800bc69b4cd531702c95ca6fb990458 + + - id: BOX_OF_SEEDS + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_SEEDS + - id: SELLABLE + value: 76800.0 + - id: SKULL_HEAD + texture: 2c3f854bb65265ab3ff2e362669a5f806ab84dc240a4b99f9a62ab7267728ba3 + + - id: MUTANT_NETHER_WART + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_NETHER_WART + - id: SELLABLE + value: 102400.0 + - id: SKULL_HEAD + texture: 111a3cec7aaf904212ccf93bb67a3caf3d649783ba90b8b60bb63c7687eb39f + + - id: POLISHED_PUMPKIN + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_PUMPKIN + - id: SELLABLE + value: 256000.0 + - id: SKULL_HEAD + texture: 8db711ff52eedda59c434bb03169763d7c40b5b89127778feacd63aa94dfc \ No newline at end of file diff --git a/configuration/skyblock/items/crimson.yml b/configuration/skyblock/items/crimson.yml index 4287391a1..6bebcff71 100644 --- a/configuration/skyblock/items/crimson.yml +++ b/configuration/skyblock/items/crimson.yml @@ -4,33 +4,6 @@ items: components: - id: SKULL_HEAD texture: 19b393eb6a5bd65d735aaa3b3cfa993b50f5e536d7a13b535514bd0740d63350 - - id: ENCHANTED_MYCELIUM_CUBE - rarity: COMMON - components: - - id: ENCHANTED - recipe_type: MINING - - id: SELLABLE - value: 128000.0 - - id: SKULL_HEAD - texture: 9a351d5316e5b508fbbf595e0773aec9639a0891807fef09bc59a56d46490cb0 - - id: ENCHANTED_RED_SAND_CUBE - rarity: COMMON - components: - - id: ENCHANTED - recipe_type: MINING - - id: SELLABLE - value: 128000.0 - - id: SKULL_HEAD - texture: f31f5c78b7e961591293756b9e15012db10457846c5ebc5db0f2b0e1873468ee - - id: ENCHANTED_SULPHUR_CUBE - rarity: COMMON - components: - - id: ENCHANTED - recipe_type: MINING - - id: SELLABLE - value: 256000.0 - - id: SKULL_HEAD - texture: 4f0c28dfcf42d4dbd27c3378f67176c84800bc69b4cd531702c95ca6fb990458 - id: FLAMES rarity: COMMON components: diff --git a/configuration/skyblock/items/enchantment.yml b/configuration/skyblock/items/enchantment.yml index 35f107f20..e5f8611a0 100644 --- a/configuration/skyblock/items/enchantment.yml +++ b/configuration/skyblock/items/enchantment.yml @@ -8,6 +8,7 @@ items: handler_id: ENCHANTED_BOOK - id: TRACKED_UNIQUE - id: ENCHANTED + - id: HOT_POTATO_BOOK rarity: EPIC lore: @@ -23,6 +24,25 @@ items: value: 38400 - id: TRACKED_UNIQUE - id: ENCHANTED + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AA + - AB + ingredients: + A: + type: PAPER + amount: 1 + B: + type: ENCHANTED_BAKED_POTATO + amount: 1 + result: + type: HOT_POTATO_BOOK + amount: 1 + - id: FUMING_POTATO_BOOK rarity: EPIC lore: diff --git a/configuration/skyblock/items/farming/farming.yml b/configuration/skyblock/items/farming/farming.yml index b41000afd..c38a0e8c7 100644 --- a/configuration/skyblock/items/farming/farming.yml +++ b/configuration/skyblock/items/farming/farming.yml @@ -1,12 +1,4 @@ items: - - id: BOX_OF_SEEDS - rarity: COMMON - components: - - id: ENCHANTED - - id: SELLABLE - value: 76800.0 - - id: SKULL_HEAD - texture: 2c3f854bb65265ab3ff2e362669a5f806ab84dc240a4b99f9a62ab7267728ba3 - id: CARROT_CRYSTAL rarity: COMMON components: @@ -18,6 +10,7 @@ items: - FARMLAND - id: PLACE_EVENT handler_id: CARROT_CRYSTAL_PLACE + - id: COMPOST rarity: COMMON components: @@ -25,6 +18,7 @@ items: texture: ba39df36a6665e9dc33f3413717daefafd1f78b97eef24f3cae9e3bbe3c77b9b - id: SELLABLE value: 4.0 + - id: COMPOST_BUNDLE rarity: COMMON components: @@ -33,11 +27,13 @@ items: - id: SELLABLE value: 10.0 - id: TRACKED_UNIQUE + - id: DUNG rarity: COMMON components: - id: SELLABLE value: 100.0 + - id: FLOWER_CRYSTAL rarity: COMMON components: @@ -49,6 +45,7 @@ items: - GRASS_BLOCK - id: PLACE_EVENT handler_id: FLOWER_CRYSTAL_PLACE + - id: HONEY_JAR rarity: COMMON components: @@ -56,27 +53,13 @@ items: texture: d8ecd636150837b0d9d0299b64cd0b5b55a6f99158c94600eb90fc5ba677330d - id: SELLABLE value: 100.0 - - id: MUTANT_NETHER_WART - rarity: COMMON - components: - - id: ENCHANTED - - id: SELLABLE - value: 102400.0 - - id: SKULL_HEAD - texture: 111a3cec7aaf904212ccf93bb67a3caf3d649783ba90b8b60bb63c7687eb39f + - id: PLANT_MATTER rarity: COMMON components: - id: SELLABLE value: 100.0 - - id: POLISHED_PUMPKIN - rarity: COMMON - components: - - id: ENCHANTED - - id: SELLABLE - value: 256000.0 - - id: SKULL_HEAD - texture: 8db711ff52eedda59c434bb03169763d7c40b5b89127778feacd63aa94dfc + - id: POTATO_CRYSTAL rarity: COMMON components: @@ -88,6 +71,7 @@ items: - FARMLAND - id: PLACE_EVENT handler_id: POTATO_CRYSTAL_PLACE + - id: PUMPKIN_AND_MELON_CRYSTAL rarity: COMMON components: @@ -100,6 +84,7 @@ items: - DIRT - id: PLACE_EVENT handler_id: PUMPKIN_AND_MELON_CRYSTAL_PLACE + - id: ROOKIE_HOE rarity: COMMON - id: TIGHTLY_TIED_HAY_BALE @@ -110,6 +95,7 @@ items: value: 1119744.0 - id: SKULL_HEAD texture: f7c33cd0c14ba830da149907f7a6aae835b6a35aea01e0ce073fb3c59cc46326 + - id: WHEAT_CRYSTAL rarity: COMMON components: diff --git a/configuration/skyblock/items/mining/fine.yml b/configuration/skyblock/items/mining/fine.yml index ccc84474a..b637ede15 100644 --- a/configuration/skyblock/items/mining/fine.yml +++ b/configuration/skyblock/items/mining/fine.yml @@ -10,6 +10,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Amber Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_AMBER_GEM + amount: 80 + result: + type: FINE_AMBER_GEM + amount: 1 - id: FINE_AMETHYST_GEM rarity: RARE @@ -22,6 +33,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Amethyst Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_AMETHYST_GEM + amount: 80 + result: + type: FINE_AMETHYST_GEM + amount: 1 - id: FINE_JADE_GEM rarity: RARE @@ -34,6 +56,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Jade Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_JADE_GEM + amount: 80 + result: + type: FINE_JADE_GEM + amount: 1 - id: FINE_JASPER_GEM rarity: RARE @@ -46,6 +79,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Jasper Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_JASPER_GEM + amount: 80 + result: + type: FINE_JASPER_GEM + amount: 1 - id: FINE_RUBY_GEM rarity: RARE @@ -58,6 +102,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Ruby Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_RUBY_GEM + amount: 80 + result: + type: FINE_RUBY_GEM + amount: 1 - id: FINE_SAPPHIRE_GEM rarity: RARE @@ -70,6 +125,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Sapphire Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_SAPPHIRE_GEM + amount: 80 + result: + type: FINE_SAPPHIRE_GEM + amount: 1 - id: FINE_TOPAZ_GEM rarity: RARE @@ -82,6 +148,17 @@ items: value: 19200.0 - id: CUSTOM_DISPLAY_NAME display_name: Fine Topaz Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_TOPAZ_GEM + amount: 80 + result: + type: FINE_TOPAZ_GEM + amount: 1 - id: FINE_OPAL_GEM rarity: RARE @@ -94,6 +171,17 @@ items: rarity: FINE gemstone: OPAL skull_texture: ad798e20a47d251a9e33d40332973c7189ac1550760ba25c4b956c9159364568 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_OPAL_GEM + amount: 80 + result: + type: FINE_OPAL_GEM + amount: 1 - id: FINE_AQUAMARINE_GEM rarity: RARE @@ -106,6 +194,17 @@ items: rarity: FINE gemstone: AQUAMARINE skull_texture: 2b822b9dc70b9ca20008c332f481cbebb52bd50669ca98a89fd33d1345fa10f2 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_AQUAMARINE_GEM + amount: 80 + result: + type: FINE_AQUAMARINE_GEM + amount: 1 - id: FINE_CITRINE_GEM rarity: RARE @@ -118,6 +217,17 @@ items: rarity: FINE gemstone: CITRINE skull_texture: ec0ab9c9f35a1bf44de18a0db2aa0ed2ebe8b9faa820307da3638f36a8306536 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_CITRINE_GEM + amount: 80 + result: + type: FINE_CITRINE_GEM + amount: 1 - id: FINE_ONYX_GEM rarity: RARE @@ -130,6 +240,17 @@ items: rarity: FINE gemstone: ONYX skull_texture: 787a326331fe27f7ee074f97727604c495f95c378121302e879e1f40ba4d20a8 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_ONYX_GEM + amount: 80 + result: + type: FINE_ONYX_GEM + amount: 1 - id: FINE_PERIDOT_GEM rarity: RARE @@ -142,3 +263,14 @@ items: rarity: FINE gemstone: PERIDOT skull_texture: fcba7aefc1c4f412868739e2f2c2e651edeb1be25d3c7175e68a05b67506a1ed + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FLAWED_PERIDOT_GEM + amount: 80 + result: + type: FINE_PERIDOT_GEM + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/mining/flawed.yml b/configuration/skyblock/items/mining/flawed.yml index 2968774cd..18aa8d09e 100644 --- a/configuration/skyblock/items/mining/flawed.yml +++ b/configuration/skyblock/items/mining/flawed.yml @@ -10,6 +10,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Amber Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_AMBER_GEM + amount: 80 + result: + type: FLAWED_AMBER_GEM + amount: 1 - id: FLAWED_AMETHYST_GEM rarity: UNCOMMON @@ -22,6 +33,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Amethyst Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_AMETHYST_GEM + amount: 80 + result: + type: FLAWED_AMETHYST_GEM + amount: 1 - id: FLAWED_JADE_GEM rarity: UNCOMMON @@ -34,6 +56,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Jade Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_JADE_GEM + amount: 80 + result: + type: FLAWED_JADE_GEM + amount: 1 - id: FLAWED_JASPER_GEM rarity: UNCOMMON @@ -46,6 +79,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Jasper Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_JASPER_GEM + amount: 80 + result: + type: FLAWED_JASPER_GEM + amount: 1 - id: FLAWED_RUBY_GEM rarity: UNCOMMON @@ -58,6 +102,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Ruby Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_RUBY_GEM + amount: 80 + result: + type: FLAWED_RUBY_GEM + amount: 1 - id: FLAWED_SAPPHIRE_GEM rarity: UNCOMMON @@ -70,6 +125,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Sapphire Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_SAPPHIRE_GEM + amount: 80 + result: + type: FLAWED_SAPPHIRE_GEM + amount: 1 - id: FLAWED_TOPAZ_GEM rarity: UNCOMMON @@ -82,6 +148,17 @@ items: value: 240.0 - id: CUSTOM_DISPLAY_NAME display_name: Flawed Topaz Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_TOPAZ_GEM + amount: 80 + result: + type: FLAWED_TOPAZ_GEM + amount: 1 - id: FLAWED_OPAL_GEM rarity: UNCOMMON @@ -94,6 +171,17 @@ items: rarity: FLAWED gemstone: OPAL skull_texture: eadc3bcdd7c701b63f8b8b4a96e429316a08388669d9a98c1a98791729b961df + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_OPAL_GEM + amount: 80 + result: + type: FLAWED_OPAL_GEM + amount: 1 - id: FLAWED_AQUAMARINE_GEM rarity: UNCOMMON @@ -106,6 +194,17 @@ items: rarity: FLAWED gemstone: AQUAMARINE skull_texture: e4166254ac8b324c1b78eadc7c249866c6742c17586a33aea6a89fe346b2acf0 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_AQUAMARINE_GEM + amount: 80 + result: + type: FLAWED_AQUAMARINE_GEM + amount: 1 - id: FLAWED_CITRINE_GEM rarity: UNCOMMON @@ -118,6 +217,17 @@ items: rarity: FLAWED gemstone: CITRINE skull_texture: dc0b8433579f480adc685748b2bf2eccc69221137f704bbb922614191f801b26 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_CITRINE_GEM + amount: 80 + result: + type: FLAWED_CITRINE_GEM + amount: 1 - id: FLAWED_ONYX_GEM rarity: UNCOMMON @@ -130,6 +240,17 @@ items: rarity: FLAWED gemstone: ONYX skull_texture: 352a91f44bcbc78d4c9d045e941a23f7bdb4d99609e60bdcec842396feb315a7 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_ONYX_GEM + amount: 80 + result: + type: FLAWED_ONYX_GEM + amount: 1 - id: FLAWED_PERIDOT_GEM rarity: UNCOMMON @@ -142,3 +263,14 @@ items: rarity: FLAWED gemstone: PERIDOT skull_texture: 75da734e63aa22116e64703bb33271c4fbc3d1332a6a60c24af49b804193bf46 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: ROUGH_PERIDOT_GEM + amount: 80 + result: + type: FLAWED_PERIDOT_GEM + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/mining/flawless.yml b/configuration/skyblock/items/mining/flawless.yml index 966b79b57..d78e07964 100644 --- a/configuration/skyblock/items/mining/flawless.yml +++ b/configuration/skyblock/items/mining/flawless.yml @@ -9,6 +9,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Amber Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_AMBER_GEM + amount: 80 + result: + type: FLAWLESS_AMBER_GEM + amount: 1 - id: FLAWLESS_AMETHYST_GEM rarity: EPIC @@ -20,6 +31,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Amethyst Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_AMETHYST_GEM + amount: 80 + result: + type: FLAWLESS_AMETHYST_GEM + amount: 1 - id: FLAWLESS_JADE_GEM rarity: EPIC @@ -31,6 +53,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Jade Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_JADE_GEM + amount: 80 + result: + type: FLAWLESS_JADE_GEM + amount: 1 - id: FLAWLESS_JASPER_GEM rarity: EPIC @@ -42,6 +75,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Jasper Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_JASPER_GEM + amount: 80 + result: + type: FLAWLESS_JASPER_GEM + amount: 1 - id: FLAWLESS_RUBY_GEM rarity: EPIC @@ -53,6 +97,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Ruby Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_RUBY_GEM + amount: 80 + result: + type: FLAWLESS_RUBY_GEM + amount: 1 - id: FLAWLESS_SAPPHIRE_GEM rarity: EPIC @@ -64,6 +119,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Sapphire Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_SAPPHIRE_GEM + amount: 80 + result: + type: FLAWLESS_SAPPHIRE_GEM + amount: 1 - id: FLAWLESS_TOPAZ_GEM rarity: EPIC @@ -75,6 +141,17 @@ items: - id: TRACKED_UNIQUE - id: CUSTOM_DISPLAY_NAME display_name: Flawless Topaz Gemstone + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_TOPAZ_GEM + amount: 80 + result: + type: FLAWLESS_TOPAZ_GEM + amount: 1 - id: FLAWLESS_OPAL_GEM rarity: EPIC @@ -86,6 +163,17 @@ items: rarity: FLAWLESS gemstone: OPAL skull_texture: 5d15ed70e720040ad7311e69359dfdf5e114eadd2a4c1f971a9501341a45264b + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_OPAL_GEM + amount: 80 + result: + type: FLAWLESS_OPAL_GEM + amount: 1 - id: FLAWLESS_AQUAMARINE_GEM rarity: EPIC @@ -97,6 +185,17 @@ items: rarity: FLAWLESS gemstone: AQUAMARINE skull_texture: d37699bdf8cb43eff147d9ce19b14802f9bc88a21e63ad28b669530e8a3c0b57 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_AQUAMARINE_GEM + amount: 80 + result: + type: FLAWLESS_AQUAMARINE_GEM + amount: 1 - id: FLAWLESS_CITRINE_GEM rarity: EPIC @@ -108,6 +207,17 @@ items: rarity: FLAWLESS gemstone: CITRINE skull_texture: f06b4f63d3d3a39c98565af4858a5135be774ad672eb236bb65adfc8cb3425e8 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_CITRINE_GEM + amount: 80 + result: + type: FLAWLESS_CITRINE_GEM + amount: 1 - id: FLAWLESS_ONYX_GEM rarity: EPIC @@ -119,6 +229,17 @@ items: rarity: FLAWLESS gemstone: ONYX skull_texture: 1ca9b2841f71ba6fc4d6d2e97e80c1801f36ca3958e5a9a81a4f8785f6434367 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_ONYX_GEM + amount: 80 + result: + type: FLAWLESS_ONYX_GEM + amount: 1 - id: FLAWLESS_PERIDOT_GEM rarity: EPIC @@ -130,3 +251,14 @@ items: rarity: FLAWLESS gemstone: PERIDOT skull_texture: 1884a8dcb7128341ce09cb3616c11c3e46f80d083a6f2dbb4dbe0bb932318b09 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPELESS + recipe-type: MINING + ingredients: + - type: FINE_PERIDOT_GEM + amount: 80 + result: + type: FLAWLESS_PERIDOT_GEM + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/minions.yml b/configuration/skyblock/items/minions.yml index 57e15ed32..fbd8b4edf 100644 --- a/configuration/skyblock/items/minions.yml +++ b/configuration/skyblock/items/minions.yml @@ -152,12 +152,12 @@ items: - SLIME_BALL:20 - SLIME_BALL:40 - SLIME_BALL:64 - - ENCHANTED_SLIMEBALL:1 - - ENCHANTED_SLIMEBALL:3 - - ENCHANTED_SLIMEBALL:8 - - ENCHANTED_SLIMEBALL:16 - - ENCHANTED_SLIMEBALL:32 - - ENCHANTED_SLIMEBALL:64 + - ENCHANTED_SLIME_BALL:1 + - ENCHANTED_SLIME_BALL:3 + - ENCHANTED_SLIME_BALL:8 + - ENCHANTED_SLIME_BALL:16 + - ENCHANTED_SLIME_BALL:32 + - ENCHANTED_SLIME_BALL:64 - ENCHANTED_SLIME_BLOCK:1 - id: SPIDER_MINION material: PLAYER_HEAD @@ -760,7 +760,7 @@ items: - ENCHANTED_EMERALD:32 - ENCHANTED_EMERALD:64 - ENCHANTED_EMERALD_BLOCK:1 - - id: ENDSTONE_MINION + - id: END_STONE_MINION material: PLAYER_HEAD rarity: COMMON components: diff --git a/configuration/skyblock/items/miscellaneous/fuel.yml b/configuration/skyblock/items/miscellaneous/fuel.yml index 062a8a24a..4b43c2d8e 100644 --- a/configuration/skyblock/items/miscellaneous/fuel.yml +++ b/configuration/skyblock/items/miscellaneous/fuel.yml @@ -8,6 +8,28 @@ items: fuel_percentage: 25.0 last_time_ms: 0 - id: ENCHANTED + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_IRON_INGOT + amount: 1 + B: + type: ENCHANTED_COAL_BLOCK + amount: 2 + O: + type: AIR + amount: 1 + result: + type: ENCHANTED_LAVA_BUCKET + amount: 1 + - id: EVERBURNING_FLAME rarity: COMMON components: @@ -19,6 +41,32 @@ items: fuel_percentage: 35.0 last_time_ms: 0 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - CDC + - ABA + ingredients: + A: + type: FLAMES + amount: 4 + B: + type: ENCHANTED_RED_SAND_CUBE + amount: 1 + C: + type: ENCHANTED_SULPHUR_CUBE + amount: 1 + D: + type: PLASMA_BUCKET + amount: 1 + result: + type: EVERBURNING_FLAME + amount: 1 + - id: MAGMA_BUCKET rarity: COMMON components: @@ -45,6 +93,7 @@ items: result: type: MAGMA_BUCKET amount: 1 + - id: PLASMA_BUCKET rarity: COMMON components: diff --git a/configuration/skyblock/items/miscellaneous/shipping.yml b/configuration/skyblock/items/miscellaneous/shipping.yml index e9ab4465b..0ff6eaec4 100644 --- a/configuration/skyblock/items/miscellaneous/shipping.yml +++ b/configuration/skyblock/items/miscellaneous/shipping.yml @@ -6,6 +6,29 @@ items: percentage: 50.0 - id: SELLABLE value: 1200.0 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AOA + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_IRON_INGOT + amount: 1 + B: + type: CHEST + amount: 1 + O: + type: AIR + amount: 1 + result: + type: BUDGET_HOPPER + amount: 1 + - id: ENCHANTED_HOPPER rarity: COMMON components: @@ -14,3 +37,25 @@ items: percentage: 90.0 - id: SELLABLE value: 192000.0 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AOA + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_IRON_BLOCK + amount: 1 + B: + type: CHEST + amount: 1 + O: + type: AIR + amount: 1 + result: + type: ENCHANTED_HOPPER + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/miscellaneous/upgrade.yml b/configuration/skyblock/items/miscellaneous/upgrade.yml index 78440b930..574a4de54 100644 --- a/configuration/skyblock/items/miscellaneous/upgrade.yml +++ b/configuration/skyblock/items/miscellaneous/upgrade.yml @@ -6,12 +6,55 @@ items: speed_increase: 0.1 - id: NOT_FINISHED_YET - id: TRACKED_UNIQUE + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: COBBLESTONE + amount: 8 + B: + type: COAL + amount: 1 + result: + type: AUTO_SMELTER + amount: 1 + - id: COMPACTOR rarity: COMMON components: - id: ENCHANTED - id: NOT_FINISHED_YET - id: TRACKED_UNIQUE + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 1 + B: + type: ENCHANTED_REDSTONE + amount: 1 + O: + type: AIR + amount: 1 + result: + type: COMPACTOR + amount: 1 + - id: DIAMOND_SPREADING rarity: COMMON components: @@ -21,6 +64,26 @@ items: - id: SELLABLE value: 640.0 - id: TRACKED_UNIQUE + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: VINES + amount: 1 + B: + type: ENCHANTED_DIAMOND + amount: 1 + result: + type: DIAMOND_SPREADING + amount: 1 + - id: FLY_CATCHER rarity: COMMON components: @@ -28,6 +91,7 @@ items: speed_increase: 0.1 - id: ENCHANTED - id: TRACKED_UNIQUE + - id: MINION_EXPANDER rarity: COMMON components: @@ -35,12 +99,36 @@ items: speed_increase: 0.1 - id: ENCHANTED - id: TRACKED_UNIQUE + - id: SUPER_COMPACTOR_3000 rarity: COMMON components: - id: ENCHANTED - id: NOT_FINISHED_YET - id: TRACKED_UNIQUE + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 64 + B: + type: ENCHANTED_REDSTONE_BLOCK + amount: 1 + O: + type: AIR + amount: 1 + result: + type: SUPER_COMPACTOR_3000 + amount: 1 + - id: MITHRIL_INFUSION rarity: COMMON components: diff --git a/configuration/skyblock/items/weapons.yml b/configuration/skyblock/items/weapons.yml index 6e30f7f8f..ad6e87f8a 100644 --- a/configuration/skyblock/items/weapons.yml +++ b/configuration/skyblock/items/weapons.yml @@ -25,6 +25,25 @@ items: donation_xp: 4 parent: ASPECT_OF_THE_END: ASPECT_OF_THE_VOID + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: COMBAT + pattern: + - A + - A + - B + ingredients: + A: + type: ENCHANTED_EYE_OF_ENDER + amount: 16 + B: + type: ENCHANTED_DIAMOND + amount: 1 + result: + type: ASPECT_OF_THE_END + amount: 1 - id: ASPECT_OF_THE_JERRY material: WOODEN_SWORD @@ -205,6 +224,25 @@ items: standard_item_type: SWORD - id: SELLABLE value: 160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FISHING + pattern: + - A + - A + - B + ingredients: + A: + type: PRISMARINE_SHARD + amount: 32 + B: + type: STICK + amount: 1 + result: + type: PRISMARINE_BLADE + amount: 1 - id: ROGUE_SWORD material: GOLDEN_SWORD @@ -229,6 +267,25 @@ items: standard_item_type: SWORD - id: SELLABLE value: 2000 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: COMBAT + pattern: + - OAO + - AAA + - OAO + ingredients: + A: + type: ENCHANTED_GHAST_TEAR + amount: 5 + O: + type: AIR + amount: 1 + result: + type: SILVER_FANG + amount: 1 - id: SPIDER_SWORD material: IRON_SWORD diff --git a/configuration/skyblock/reforges/awkward.yml b/configuration/skyblock/reforges/awkward.yml index 45e56b3c9..074ba8517 100644 --- a/configuration/skyblock/reforges/awkward.yml +++ b/configuration/skyblock/reforges/awkward.yml @@ -12,7 +12,7 @@ statistics: legendary: -50 mythic: -60 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 10 uncommon: 12 rare: 15 @@ -20,7 +20,7 @@ statistics: legendary: 25 mythic: 30 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 5 uncommon: 10 rare: 15 diff --git a/configuration/skyblock/reforges/blended.yml b/configuration/skyblock/reforges/blended.yml index 2fdcc855c..aea910131 100644 --- a/configuration/skyblock/reforges/blended.yml +++ b/configuration/skyblock/reforges/blended.yml @@ -23,7 +23,7 @@ statistics: SPEED: expression: "1" - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 1 rare: 2 @@ -31,7 +31,7 @@ statistics: legendary: 3 mythic: 3 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 1 uncommon: 2 rare: 2 diff --git a/configuration/skyblock/reforges/clean.yml b/configuration/skyblock/reforges/clean.yml index 3b79ad21e..27a4e1ea7 100644 --- a/configuration/skyblock/reforges/clean.yml +++ b/configuration/skyblock/reforges/clean.yml @@ -4,7 +4,7 @@ applicableTypes: - "ARMOR" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 2 uncommon: 4 rare: 6 diff --git a/configuration/skyblock/reforges/deadly.yml b/configuration/skyblock/reforges/deadly.yml index ff2f3425c..e7cffc1e2 100644 --- a/configuration/skyblock/reforges/deadly.yml +++ b/configuration/skyblock/reforges/deadly.yml @@ -4,7 +4,7 @@ applicableTypes: - "BOWS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 10 uncommon: 13 rare: 16 @@ -12,7 +12,7 @@ statistics: legendary: 22 mythic: 25 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 5 uncommon: 10 rare: 18 diff --git a/configuration/skyblock/reforges/epic.yml b/configuration/skyblock/reforges/epic.yml index ecae5531d..91ae61cfc 100644 --- a/configuration/skyblock/reforges/epic.yml +++ b/configuration/skyblock/reforges/epic.yml @@ -13,7 +13,7 @@ statistics: legendary: 40 mythic: 50 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 10 uncommon: 15 rare: 20 diff --git a/configuration/skyblock/reforges/fair.yml b/configuration/skyblock/reforges/fair.yml index 92f98b2ff..756c96ead 100644 --- a/configuration/skyblock/reforges/fair.yml +++ b/configuration/skyblock/reforges/fair.yml @@ -13,7 +13,7 @@ statistics: legendary: 10 mythic: 12 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 2 uncommon: 3 rare: 4 @@ -21,7 +21,7 @@ statistics: legendary: 10 mythic: 12 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 3 rare: 4 diff --git a/configuration/skyblock/reforges/fierce.yml b/configuration/skyblock/reforges/fierce.yml index c290da6d2..c5a9ef3e2 100644 --- a/configuration/skyblock/reforges/fierce.yml +++ b/configuration/skyblock/reforges/fierce.yml @@ -4,7 +4,7 @@ applicableTypes: - "ARMOR" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 2 uncommon: 3 rare: 4 @@ -20,7 +20,7 @@ statistics: legendary: 10 mythic: 12 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 4 uncommon: 7 rare: 10 diff --git a/configuration/skyblock/reforges/fine.yml b/configuration/skyblock/reforges/fine.yml index cbd20862a..9b6dba09d 100644 --- a/configuration/skyblock/reforges/fine.yml +++ b/configuration/skyblock/reforges/fine.yml @@ -4,7 +4,7 @@ applicableTypes: - "BOWS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 5 uncommon: 7 rare: 9 @@ -20,7 +20,7 @@ statistics: legendary: 25 mythic: 40 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 4 rare: 7 diff --git a/configuration/skyblock/reforges/great.yml b/configuration/skyblock/reforges/great.yml index f23eacd47..d335ad753 100644 --- a/configuration/skyblock/reforges/great.yml +++ b/configuration/skyblock/reforges/great.yml @@ -20,7 +20,7 @@ statistics: legendary: 12 mythic: 16 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 4 rare: 6 diff --git a/configuration/skyblock/reforges/hasty.yml b/configuration/skyblock/reforges/hasty.yml index 34054aa7b..fb1666797 100644 --- a/configuration/skyblock/reforges/hasty.yml +++ b/configuration/skyblock/reforges/hasty.yml @@ -4,7 +4,7 @@ applicableTypes: - "BOWS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 20 uncommon: 25 rare: 30 diff --git a/configuration/skyblock/reforges/heavy.yml b/configuration/skyblock/reforges/heavy.yml index c4a92e863..304ad6f42 100644 --- a/configuration/skyblock/reforges/heavy.yml +++ b/configuration/skyblock/reforges/heavy.yml @@ -15,7 +15,7 @@ statistics: SPEED: expression: "-1" - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: -1 uncommon: -2 rare: -2 diff --git a/configuration/skyblock/reforges/hefty.yml b/configuration/skyblock/reforges/hefty.yml index 28fc3aff2..882c9005c 100644 --- a/configuration/skyblock/reforges/hefty.yml +++ b/configuration/skyblock/reforges/hefty.yml @@ -15,7 +15,7 @@ statistics: SPEED: expression: "-1" - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: -2 uncommon: -2 rare: -3 diff --git a/configuration/skyblock/reforges/honored.yml b/configuration/skyblock/reforges/honored.yml index d17198e7a..3addab1fb 100644 --- a/configuration/skyblock/reforges/honored.yml +++ b/configuration/skyblock/reforges/honored.yml @@ -39,7 +39,7 @@ statistics: legendary: 6 mythic: 7 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 1 rare: 1 diff --git a/configuration/skyblock/reforges/legendary.yml b/configuration/skyblock/reforges/legendary.yml index e3da5e13b..5097a2733 100644 --- a/configuration/skyblock/reforges/legendary.yml +++ b/configuration/skyblock/reforges/legendary.yml @@ -13,7 +13,7 @@ statistics: legendary: 25 mythic: 32 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 5 uncommon: 7 rare: 9 @@ -21,7 +21,7 @@ statistics: legendary: 15 mythic: 18 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 5 uncommon: 10 rare: 15 diff --git a/configuration/skyblock/reforges/light.yml b/configuration/skyblock/reforges/light.yml index ddc400192..ae7673af0 100644 --- a/configuration/skyblock/reforges/light.yml +++ b/configuration/skyblock/reforges/light.yml @@ -4,7 +4,7 @@ applicableTypes: - "ARMOR" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 1 rare: 2 @@ -18,7 +18,7 @@ statistics: BONUS_ATTACK_SPEED: expression: "{level} + 1" - CRIT_DAMAGE: + CRITICAL_DAMAGE: expression: "{level} + 1" HEALTH: diff --git a/configuration/skyblock/reforges/menacing.yml b/configuration/skyblock/reforges/menacing.yml index 5e7efaa04..09c623c80 100644 --- a/configuration/skyblock/reforges/menacing.yml +++ b/configuration/skyblock/reforges/menacing.yml @@ -4,7 +4,7 @@ applicableTypes: - "EQUIPMENT" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 1 rare: 1 @@ -12,7 +12,7 @@ statistics: legendary: 2 mythic: 2 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 3 rare: 3 diff --git a/configuration/skyblock/reforges/mythic.yml b/configuration/skyblock/reforges/mythic.yml index 4dc3c67d6..5eb2265d2 100644 --- a/configuration/skyblock/reforges/mythic.yml +++ b/configuration/skyblock/reforges/mythic.yml @@ -12,7 +12,7 @@ statistics: legendary: 50 mythic: 60 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 2 rare: 3 diff --git a/configuration/skyblock/reforges/neat.yml b/configuration/skyblock/reforges/neat.yml index 7708e3b09..2e0e65e75 100644 --- a/configuration/skyblock/reforges/neat.yml +++ b/configuration/skyblock/reforges/neat.yml @@ -12,7 +12,7 @@ statistics: legendary: 20 mythic: 30 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 10 uncommon: 12 rare: 14 @@ -20,7 +20,7 @@ statistics: legendary: 20 mythic: 25 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 4 uncommon: 8 rare: 14 diff --git a/configuration/skyblock/reforges/odd_bow.yml b/configuration/skyblock/reforges/odd_bow.yml index 4336e9a5b..7f2bdbdda 100644 --- a/configuration/skyblock/reforges/odd_bow.yml +++ b/configuration/skyblock/reforges/odd_bow.yml @@ -12,7 +12,7 @@ statistics: legendary: -50 mythic: -50 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 2 rare: 4 @@ -20,7 +20,7 @@ statistics: legendary: 10 mythic: 10 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 1 uncommon: 2 rare: 4 diff --git a/configuration/skyblock/reforges/odd_sword.yml b/configuration/skyblock/reforges/odd_sword.yml index 2c1415ca4..57c862104 100644 --- a/configuration/skyblock/reforges/odd_sword.yml +++ b/configuration/skyblock/reforges/odd_sword.yml @@ -5,7 +5,7 @@ applicableTypes: - "FISHING_RODS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 12 uncommon: 15 rare: 15 @@ -13,7 +13,7 @@ statistics: legendary: 25 mythic: 30 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 10 uncommon: 15 rare: 15 diff --git a/configuration/skyblock/reforges/pure.yml b/configuration/skyblock/reforges/pure.yml index 9fbba0703..5febfb211 100644 --- a/configuration/skyblock/reforges/pure.yml +++ b/configuration/skyblock/reforges/pure.yml @@ -12,7 +12,7 @@ statistics: legendary: 8 mythic: 10 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 2 uncommon: 4 rare: 6 @@ -39,7 +39,7 @@ statistics: legendary: 4 mythic: 5 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 3 rare: 4 diff --git a/configuration/skyblock/reforges/rapid.yml b/configuration/skyblock/reforges/rapid.yml index e592beef7..c573be8c6 100644 --- a/configuration/skyblock/reforges/rapid.yml +++ b/configuration/skyblock/reforges/rapid.yml @@ -12,7 +12,7 @@ statistics: legendary: 10 mythic: 12 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 35 uncommon: 45 rare: 55 diff --git a/configuration/skyblock/reforges/rich_bow.yml b/configuration/skyblock/reforges/rich_bow.yml index e4b8b8f62..1cb1e48a7 100644 --- a/configuration/skyblock/reforges/rich_bow.yml +++ b/configuration/skyblock/reforges/rich_bow.yml @@ -12,7 +12,7 @@ statistics: legendary: 20 mythic: 30 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 10 uncommon: 12 rare: 14 @@ -20,7 +20,7 @@ statistics: legendary: 20 mythic: 25 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 2 uncommon: 4 rare: 7 diff --git a/configuration/skyblock/reforges/rich_sword.yml b/configuration/skyblock/reforges/rich_sword.yml index 3581bce26..6f72ce8a0 100644 --- a/configuration/skyblock/reforges/rich_sword.yml +++ b/configuration/skyblock/reforges/rich_sword.yml @@ -13,7 +13,7 @@ statistics: legendary: 20 mythic: 20 - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 2 rare: 4 @@ -21,7 +21,7 @@ statistics: legendary: 10 mythic: 10 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 1 uncommon: 2 rare: 4 diff --git a/configuration/skyblock/reforges/rugged.yml b/configuration/skyblock/reforges/rugged.yml index 2c17880e0..ce0ea78a3 100644 --- a/configuration/skyblock/reforges/rugged.yml +++ b/configuration/skyblock/reforges/rugged.yml @@ -12,7 +12,7 @@ statistics: legendary: 18 mythic: 24 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 3 uncommon: 5 rare: 8 diff --git a/configuration/skyblock/reforges/sharp.yml b/configuration/skyblock/reforges/sharp.yml index e1033b1dd..8e64840b0 100644 --- a/configuration/skyblock/reforges/sharp.yml +++ b/configuration/skyblock/reforges/sharp.yml @@ -5,7 +5,7 @@ applicableTypes: - "FISHING_RODS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 10 uncommon: 12 rare: 14 @@ -13,7 +13,7 @@ statistics: legendary: 20 mythic: 25 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 20 uncommon: 30 rare: 40 diff --git a/configuration/skyblock/reforges/soft.yml b/configuration/skyblock/reforges/soft.yml index 96b8b48a5..1fade9607 100644 --- a/configuration/skyblock/reforges/soft.yml +++ b/configuration/skyblock/reforges/soft.yml @@ -28,10 +28,10 @@ statistics: legendary: 2 mythic: 2 - CRIT_CHANCE: + CRITICAL_CHANCE: expression: "1" - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 1 uncommon: 1 rare: 1 diff --git a/configuration/skyblock/reforges/spicy.yml b/configuration/skyblock/reforges/spicy.yml index a893a5061..f50d769a8 100644 --- a/configuration/skyblock/reforges/spicy.yml +++ b/configuration/skyblock/reforges/spicy.yml @@ -13,10 +13,10 @@ statistics: legendary: 10 mythic: 12 - CRIT_CHANCE: + CRITICAL_CHANCE: expression: "1" - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 25 uncommon: 35 rare: 45 diff --git a/configuration/skyblock/reforges/stained.yml b/configuration/skyblock/reforges/stained.yml index 47b1f53ae..1a496b32b 100644 --- a/configuration/skyblock/reforges/stained.yml +++ b/configuration/skyblock/reforges/stained.yml @@ -10,7 +10,7 @@ statistics: DEFENSE: expression: "{level} + 2" - CRIT_CHANCE: + CRITICAL_CHANCE: common: 1 uncommon: 1 rare: 2 diff --git a/configuration/skyblock/reforges/unreal.yml b/configuration/skyblock/reforges/unreal.yml index ba0edaa14..04cc908e1 100644 --- a/configuration/skyblock/reforges/unreal.yml +++ b/configuration/skyblock/reforges/unreal.yml @@ -4,7 +4,7 @@ applicableTypes: - "BOWS" statistics: - CRIT_CHANCE: + CRITICAL_CHANCE: common: 8 uncommon: 9 rare: 10 @@ -20,7 +20,7 @@ statistics: legendary: 25 mythic: 34 - CRIT_DAMAGE: + CRITICAL_DAMAGE: common: 5 uncommon: 10 rare: 18 diff --git a/configuration/skyblock/skills/combat.yml b/configuration/skyblock/skills/combat.yml index eb0d0214e..6f903d224 100644 --- a/configuration/skyblock/skills/combat.yml +++ b/configuration/skyblock/skills/combat.yml @@ -19,7 +19,7 @@ rewards: amount: 100 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -37,7 +37,7 @@ rewards: amount: 250 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -55,7 +55,7 @@ rewards: amount: 500 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -73,7 +73,7 @@ rewards: amount: 750 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -91,7 +91,7 @@ rewards: amount: 1000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -109,7 +109,7 @@ rewards: amount: 2000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -127,7 +127,7 @@ rewards: amount: 3000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -145,7 +145,7 @@ rewards: amount: 4000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -163,7 +163,7 @@ rewards: amount: 5000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -181,7 +181,7 @@ rewards: amount: 7500 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -199,7 +199,7 @@ rewards: amount: 10000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -220,7 +220,7 @@ rewards: amount: 15000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -238,7 +238,7 @@ rewards: amount: 20000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -256,7 +256,7 @@ rewards: amount: 25000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -274,7 +274,7 @@ rewards: amount: 30000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -292,7 +292,7 @@ rewards: amount: 40000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -310,7 +310,7 @@ rewards: amount: 50000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -328,7 +328,7 @@ rewards: amount: 65000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -346,7 +346,7 @@ rewards: amount: 80000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -364,7 +364,7 @@ rewards: amount: 100000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -382,7 +382,7 @@ rewards: amount: 125000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -400,7 +400,7 @@ rewards: amount: 150000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -418,7 +418,7 @@ rewards: amount: 175000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -436,7 +436,7 @@ rewards: amount: 200000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -454,7 +454,7 @@ rewards: amount: 225000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -472,7 +472,7 @@ rewards: amount: 250000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -490,7 +490,7 @@ rewards: amount: 275000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -508,7 +508,7 @@ rewards: amount: 300000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -526,7 +526,7 @@ rewards: amount: 325000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -544,7 +544,7 @@ rewards: amount: 350000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -562,7 +562,7 @@ rewards: amount: 375000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -580,7 +580,7 @@ rewards: amount: 400000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -598,7 +598,7 @@ rewards: amount: 425000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -616,7 +616,7 @@ rewards: amount: 450000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -634,7 +634,7 @@ rewards: amount: 475000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -652,7 +652,7 @@ rewards: amount: 500000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -670,7 +670,7 @@ rewards: amount: 550000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -688,7 +688,7 @@ rewards: amount: 600000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -706,7 +706,7 @@ rewards: amount: 650000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -724,7 +724,7 @@ rewards: amount: 700000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -742,7 +742,7 @@ rewards: amount: 750000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -760,7 +760,7 @@ rewards: amount: 800000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -778,7 +778,7 @@ rewards: amount: 850000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -796,7 +796,7 @@ rewards: amount: 900000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -814,7 +814,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -832,7 +832,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -850,7 +850,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -868,7 +868,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -886,7 +886,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -904,7 +904,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - type: STATS_ADDITIVE_PERCENTAGE data: @@ -922,7 +922,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 52 @@ -936,7 +936,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 53 @@ -950,7 +950,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 54 @@ -964,7 +964,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 55 @@ -978,7 +978,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 56 @@ -992,7 +992,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 57 @@ -1006,7 +1006,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 58 @@ -1020,7 +1020,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 59 @@ -1034,7 +1034,7 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 - level: 60 @@ -1048,5 +1048,5 @@ rewards: amount: 1000000 - type: STATS_BASE data: - statistic: CRIT_CHANCE + statistic: CRITICAL_CHANCE amount: 0.5 diff --git a/type.hub/src/main/java/net/swofty/type/hub/gui/GUISeymour.java b/type.hub/src/main/java/net/swofty/type/hub/gui/GUISeymour.java index c5200d17a..4c27c1978 100644 --- a/type.hub/src/main/java/net/swofty/type/hub/gui/GUISeymour.java +++ b/type.hub/src/main/java/net/swofty/type/hub/gui/GUISeymour.java @@ -42,13 +42,13 @@ public class GUISeymour extends HypixelInventoryGUI { private final double elegantTuxedoPrice = 74_999_999; private final double cheapTuxedoCritDamage = cheapTuxedoSet.stream() - .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRIT_DAMAGE)) + .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRITICAL_DAMAGE)) .sum(); private final double fancyTuxedoCritDamage = cheapTuxedoSet.stream() - .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRIT_DAMAGE)) + .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRITICAL_DAMAGE)) .sum(); private final double elegantTuxedoCritDamage = cheapTuxedoSet.stream() - .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRIT_DAMAGE)) + .mapToDouble(item -> item.getAttributeHandler().getStatistics().getOverall(ItemStatistic.CRITICAL_DAMAGE)) .sum(); private final double cheapTuxedoIntelligence = cheapTuxedoSet.stream() diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java index 9a964d0e4..077f3dcbd 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java @@ -423,35 +423,6 @@ public void initialize(MinecraftServer server) { */ SkyBlockLevelRequirement.loadFromYaml(); - /** - * Cache custom collections - */ - Thread.startVirtualThread(() -> { - // Collection Unlocks - CollectionCategories.getCategories().forEach(category -> { - Arrays.stream(category.getCollections()).forEach(collection -> { - List rewards = List.of(collection.rewards()); - rewards.parallelStream().forEach(reward -> { - Arrays.stream(reward.unlocks()).forEach(unlock -> { - if (unlock instanceof CollectionCategory.UnlockCustomAward award) { - CustomCollectionAward.AWARD_CACHE.put(award.getAward(), - Map.entry(collection.type(), reward.requirement())); - } - }); - }); - }); - }); - - // Level Unlocks - Arrays.stream(SkyBlockLevelRequirement.values()).forEach(requirement -> { - requirement.getUnlocks().forEach(unlock -> { - if (unlock instanceof CustomLevelUnlock award) { - CustomLevelAward.addToCache(requirement.asInt(), award.getAward()); - } - }); - }); - }); - /** * Load item recipes */ @@ -459,10 +430,13 @@ public void initialize(MinecraftServer server) { SkyBlockItem item = new SkyBlockItem(type); if (item.hasComponent(CraftableComponent.class)) { CraftableComponent craftableComponent = item.getComponent(CraftableComponent.class); - if (!craftableComponent.isDefaultCraftable()) return; try { - craftableComponent.getRecipes().forEach(SkyBlockRecipe::init); + List> recipes = craftableComponent.getRecipes(); + if (recipes != null && !recipes.isEmpty()) { + recipes.forEach(SkyBlockRecipe::init); + Logger.debug("Initialized " + recipes.size() + " recipe(s) for item: " + type.name()); + } } catch (Exception e) { Logger.error(e, "Failed to initialize recipe for item type: {}", type.name()); } @@ -500,6 +474,35 @@ public void initialize(MinecraftServer server) { }); }); + /** + * Cache custom collections + */ + Thread.startVirtualThread(() -> { + // Collection Unlocks + CollectionCategories.getCategories().forEach(category -> { + Arrays.stream(category.getCollections()).forEach(collection -> { + List rewards = List.of(collection.rewards()); + rewards.parallelStream().forEach(reward -> { + Arrays.stream(reward.unlocks()).forEach(unlock -> { + if (unlock instanceof CollectionCategory.UnlockCustomAward award) { + CustomCollectionAward.AWARD_CACHE.put(award.getAward(), + Map.entry(collection.type(), reward.requirement())); + } + }); + }); + }); + }); + + // Level Unlocks + Arrays.stream(SkyBlockLevelRequirement.values()).forEach(requirement -> { + requirement.getUnlocks().forEach(unlock -> { + if (unlock instanceof CustomLevelUnlock award) { + CustomLevelAward.addToCache(requirement.asInt(), award.getAward()); + } + }); + }); + }); + /** * Register Museum items */ diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/bazaar/BazaarCategories.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/bazaar/BazaarCategories.java index 401180fcb..124d89dfb 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/bazaar/BazaarCategories.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/bazaar/BazaarCategories.java @@ -102,7 +102,7 @@ public enum BazaarCategories { new BazaarItemSet(ItemType.GHAST_TEAR, "Ghast Tear", ItemType.GHAST_TEAR, ItemType.ENCHANTED_GHAST_TEAR), new BazaarItemSet(ItemType.SLIME_BALL, "Slime Drops", - ItemType.SLIME_BALL, ItemType.ENCHANTED_SLIMEBALL, ItemType.ENCHANTED_SLIME_BLOCK, ItemType.MAGMA_CREAM, ItemType.ENCHANTED_MAGMA_CREAM, ItemType.WHIPPED_MAGMA_CREAM), + ItemType.SLIME_BALL, ItemType.ENCHANTED_SLIME_BALL, ItemType.ENCHANTED_SLIME_BLOCK, ItemType.MAGMA_CREAM, ItemType.ENCHANTED_MAGMA_CREAM, ItemType.WHIPPED_MAGMA_CREAM), new BazaarItemSet(ItemType.BLAZE_ROD, "Blaze Rod", ItemType.BLAZE_ROD, ItemType.ENCHANTED_BLAZE_POWDER, ItemType.ENCHANTED_BLAZE_ROD), new BazaarItemSet(ItemType.FEATHER, "Mythological", diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/collection/CollectionLoader.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/collection/CollectionLoader.java index 644d1315e..676755a41 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/collection/CollectionLoader.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/collection/CollectionLoader.java @@ -1,6 +1,7 @@ package net.swofty.type.skyblockgeneric.collection; import lombok.Data; +import net.swofty.type.skyblockgeneric.item.components.EnchantedComponent; import org.tinylog.Logger; import net.minestom.server.item.Material; import net.swofty.commons.YamlFileUtils; @@ -15,10 +16,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Data public class CollectionLoader { @@ -52,18 +50,8 @@ public static class Reward { @Data public static class RewardData { - // Recipe data - public String recipeType; - public String craftingMaterial; - public String resultType; - public int resultAmount; - public List pattern; - public Map ingredients; - - // Special unlock data + // For recipe unlocks public String unlockedItemType; - public boolean isEnchantedRecipe; - public boolean isMinionRecipes; // XP data public Integer xp; @@ -138,8 +126,7 @@ private static CollectionCategory.ItemCollectionReward parseReward(CollectionRew for (Reward r : reward.rewards) { switch (r.type.toUpperCase()) { - case "RECIPE" -> rewardTypes.add(parseRecipe(r.data)); - case "SPECIAL_UNLOCK" -> rewardTypes.add(parseSpecialUnlock(r.data)); + case "RECIPE_UNLOCK" -> rewardTypes.add(parseRecipeUnlock(r.data)); case "XP" -> rewardTypes.add(new CollectionCategory.UnlockXP() { @Override public int xp() { @@ -152,101 +139,45 @@ public CustomCollectionAward getAward() { return CustomCollectionAward.valueOf(r.data.customAward); } }); + default -> throw new IllegalArgumentException("Unknown reward type: " + r.type); } } return new CollectionCategory.ItemCollectionReward(reward.amount, rewardTypes.toArray(new CollectionCategory.Unlock[0])); } - private static CollectionCategory.UnlockRecipe parseRecipe(RewardData data) { + private static CollectionCategory.UnlockRecipe parseRecipeUnlock(RewardData data) { return new CollectionCategory.UnlockRecipe() { @Override public SkyBlockRecipe getRecipe() { - // Convert RewardData to the Map format expected by RecipeParser - Map config = convertToRecipeConfig(data); - return RecipeParser.parseRecipe(config); - } - }; - } - - private static Map convertToRecipeConfig(RewardData data) { - Map config = new HashMap<>(); - config.put("type", data.pattern != null ? "shaped" : "shapeless"); - config.put("recipe-type", data.recipeType); - - // Convert result - Map result = new HashMap<>(); - if (data.craftingMaterial == null) { - throw new RuntimeException("Crafting material is null for " + data.unlockedItemType); - } - result.put("type", data.craftingMaterial); - result.put("amount", data.resultAmount); - config.put("result", result); - - // Convert ingredients based on recipe type - if (data.pattern != null) { - config.put("pattern", data.pattern); - config.put("ingredients", convertShapedIngredients(data.ingredients)); - } else { - config.put("ingredients", convertShapelessIngredients(data.ingredients)); - } - - return config; - } - - private static Map> convertShapedIngredients(Map ingredients) { - Map> converted = new HashMap<>(); - - for (Map.Entry entry : ingredients.entrySet()) { - Map ingredient = new HashMap<>(); - ingredient.put("type", entry.getValue().type); - ingredient.put("amount", entry.getValue().amount); - converted.put(entry.getKey(), ingredient); - } - - return converted; - } + if (data.unlockedItemType == null || data.unlockedItemType.isEmpty()) { + throw new IllegalArgumentException("unlockedItemType cannot be null or empty for RECIPE_UNLOCK"); + } - private static List> convertShapelessIngredients(Map ingredients) { - List> converted = new ArrayList<>(); + ItemType itemType = ItemType.valueOf(data.unlockedItemType); + List> recipes = SkyBlockRecipe.getFromType(itemType); - for (RecipeIngredient ingredient : ingredients.values()) { - Map ingredientMap = new HashMap<>(); - ingredientMap.put("type", ingredient.type); - ingredientMap.put("amount", ingredient.amount); - converted.add(ingredientMap); - } + if (recipes.isEmpty()) { + SkyBlockItem item = new SkyBlockItem(data.unlockedItemType); + if (item.hasComponent(EnchantedComponent.class)) { + EnchantedComponent enchanted = item.getComponent(EnchantedComponent.class); + List> enchantedRecipes = enchanted.getRecipes(); + if (!enchantedRecipes.isEmpty()) { + return enchantedRecipes.getFirst(); + } + } - return converted; - } + throw new RuntimeException("No recipes found for item: " + data.unlockedItemType + + ". Make sure the item has a CraftableComponent or EnchantedComponent with recipes defined."); + } - private static CollectionCategory.UnlockRecipe parseSpecialUnlock(RewardData data) { - return new CollectionCategory.UnlockRecipe() { - @Override - public SkyBlockRecipe getRecipe() { - return null; + return recipes.getFirst(); } @Override public List> getRecipes() { - if (data.isMinionRecipes) { - SkyBlockItem item = new SkyBlockItem(data.unlockedItemType); - if (!item.hasComponent(CraftableComponent.class)) { - throw new RuntimeException("Item " + data.unlockedItemType + " does not have a craftable component"); - } - CraftableComponent component = item.getComponent(CraftableComponent.class); - return component.getRecipes(); - } else if (data.isEnchantedRecipe) { - if (data.craftingMaterial == null) { - System.out.println("Crafting material is null for " + data.unlockedItemType); - } - return List.of(SkyBlockRecipe.getStandardEnchantedRecipe( - SkyBlockRecipe.RecipeType.valueOf(data.recipeType), - ItemType.valueOf(data.craftingMaterial), - ItemType.valueOf(data.unlockedItemType) - )); - } - return null; + SkyBlockRecipe recipe = getRecipe(); + return recipe != null ? List.of(recipe) : Collections.emptyList(); } }; } diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentCritical.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentCritical.java index b819b9fe1..894605184 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentCritical.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentCritical.java @@ -19,8 +19,8 @@ public class EnchantmentCritical implements Ench, EnchFromTable { @Override public String getDescription(int level) { - return "Increases " + ItemStatistic.CRIT_DAMAGE.getDisplayColor() + ItemStatistic.CRIT_DAMAGE.getSymbol() + " " - + ItemStatistic.CRIT_DAMAGE.getDisplayName() + " §7by §a" + MULTIPLIERS[level - 1] + "%§7."; + return "Increases " + ItemStatistic.CRITICAL_DAMAGE.getDisplayColor() + ItemStatistic.CRITICAL_DAMAGE.getSymbol() + " " + + ItemStatistic.CRITICAL_DAMAGE.getDisplayName() + " §7by §a" + MULTIPLIERS[level - 1] + "%§7."; } @Override @@ -48,7 +48,7 @@ public List getGroups() { @Override public ItemStatistics getStatistics(int level) { double increase = MULTIPLIERS[level - 1]; - return ItemStatistics.builder().withBase(ItemStatistic.CRIT_DAMAGE, increase).build(); + return ItemStatistics.builder().withBase(ItemStatistic.CRITICAL_DAMAGE, increase).build(); } @Override diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentDrain.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentDrain.java index 694f2c835..5d429b830 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentDrain.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/impl/EnchantmentDrain.java @@ -80,7 +80,7 @@ public void onDamageDealt(SkyBlockPlayer player, LivingEntity target, double dam } private double calculateCritDamageDealt(SkyBlockPlayer player, double totalDamageDealt) { - double critDamageStat = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRIT_DAMAGE); + double critDamageStat = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRITICAL_DAMAGE); double baseDamage = totalDamageDealt / (1 + (critDamageStat / 100)); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/Gemstone.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/Gemstone.java index 1b631bc60..3c6ad33a5 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/Gemstone.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gems/Gemstone.java @@ -26,7 +26,7 @@ public enum Gemstone { AQUAMARINE(List.of(ItemType.ROUGH_AQUAMARINE_GEM, ItemType.FLAWED_AQUAMARINE_GEM, ItemType.FINE_AQUAMARINE_GEM, ItemType.FLAWLESS_AQUAMARINE_GEM, ItemType.PERFECT_AQUAMARINE_GEM), ChatColor.AQUA, ItemStatistic.FISHING_SPEED), CITRINE(List.of(ItemType.ROUGH_CITRINE_GEM, ItemType.FLAWED_CITRINE_GEM, ItemType.FINE_CITRINE_GEM, ItemType.FLAWLESS_CITRINE_GEM, ItemType.PERFECT_CITRINE_GEM), ChatColor.DARK_RED, ItemStatistic.FORAGING_FORTUNE), PERIDOT(List.of(ItemType.ROUGH_PERIDOT_GEM, ItemType.FLAWED_PERIDOT_GEM, ItemType.FINE_PERIDOT_GEM, ItemType.FLAWLESS_PERIDOT_GEM, ItemType.PERFECT_PERIDOT_GEM), ChatColor.GREEN, ItemStatistic.FARMING_FORTUNE), - ONYX(List.of(ItemType.ROUGH_ONYX_GEM, ItemType.FLAWED_ONYX_GEM, ItemType.FINE_ONYX_GEM, ItemType.FLAWLESS_ONYX_GEM, ItemType.PERFECT_ONYX_GEM), ChatColor.DARK_GRAY, ItemStatistic.CRIT_DAMAGE), + ONYX(List.of(ItemType.ROUGH_ONYX_GEM, ItemType.FLAWED_ONYX_GEM, ItemType.FINE_ONYX_GEM, ItemType.FLAWLESS_ONYX_GEM, ItemType.PERFECT_ONYX_GEM), ChatColor.DARK_GRAY, ItemStatistic.CRITICAL_DAMAGE), ; public final List item; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java index c6f36e123..c8d72e276 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java @@ -59,8 +59,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { )); statistics.allStatistics().getOverall().forEach((statistic, value) -> { if (!value.equals(statistic.getBaseAdditiveValue()) || stats.contains(statistic.getDisplayName())) { - lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " + - StringUtility.toNormalCase(statistic.name()) + " §f" + + lore.add(" " + statistic.getFullDisplayName() + " §f" + StringUtility.decimalify(value, 2) + statistic.getSuffix()); } }); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java index d0c364ba3..c825a96c4 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java @@ -209,13 +209,12 @@ public ItemStack.Builder getItem(HypixelPlayer p) { PlayerStatistics statistics = player.getStatistics(); List lore = new ArrayList<>(List.of("§7Gives you a better chance at", "§7fighting strong monsters. ", " ")); List stats = new ArrayList<>(List.of(ItemStatistic.HEALTH, ItemStatistic.DEFENSE, ItemStatistic.STRENGTH, ItemStatistic.INTELLIGENCE, - ItemStatistic.CRIT_CHANCE, ItemStatistic.CRIT_DAMAGE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.TRUE_DEFENSE, + ItemStatistic.CRITICAL_CHANCE, ItemStatistic.CRITICAL_DAMAGE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.TRUE_DEFENSE, ItemStatistic.FEROCITY, ItemStatistic.HEALTH_REGENERATION, ItemStatistic.VITALITY, ItemStatistic.MENDING, ItemStatistic.SWING_RANGE)); statistics.allStatistics().getOverall().forEach((statistic, value) -> { if (stats.contains(statistic)) { - lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " + - StringUtility.toNormalCase(statistic.name()) + " §f" + + lore.add(" " + statistic.getFullDisplayName() + " §f" + StringUtility.decimalify(value, 2) + statistic.getSuffix()); } }); @@ -250,8 +249,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { statistics.allStatistics().getOverall().forEach((statistic, value) -> { if (stats.contains(statistic)) { - lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " + - StringUtility.toNormalCase(statistic.name()) + " §f" + + lore.add(" " + statistic.getFullDisplayName() + " §f" + StringUtility.decimalify(value, 2) + statistic.getSuffix()); } }); @@ -281,8 +279,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { )); // WISDOM STATS statistics.allStatistics().getOverall().forEach((statistic, value) -> { if (stats.contains(statistic)) { - lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " + - StringUtility.toNormalCase(statistic.name()) + " §f" + + lore.add(" " + statistic.getFullDisplayName() + " §f" + StringUtility.decimalify(value, 2) + statistic.getSuffix()); } }); @@ -314,8 +311,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { statistics.allStatistics().getOverall().forEach((statistic, value) -> { if (stats.contains(statistic)) { - lore.add(" " + statistic.getDisplayColor() + statistic.getSymbol() + " " + - StringUtility.toNormalCase(statistic.name()) + " §f" + + lore.add(" " + statistic.getFullDisplayName() + " §f" + StringUtility.decimalify(value, 2) + statistic.getSuffix()); } }); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java index 8a7fb3b56..7fe2b880f 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/stats/GUICombatStats.java @@ -80,7 +80,7 @@ private enum CombatStat { } ), - CRIT_CHANCE(14, ItemStatistic.CRIT_CHANCE, new GUIMaterial("3e4f49535a276aacc4dc84133bfe81be5f2a4799a4c04d9a4ddb72d819ec2b2b"), + CRIT_CHANCE(14, ItemStatistic.CRITICAL_CHANCE, new GUIMaterial("3e4f49535a276aacc4dc84133bfe81be5f2a4799a4c04d9a4ddb72d819ec2b2b"), player -> List.of( "§7Critical Chance is the percent", "§7chance that you land a Critical Hit", @@ -89,18 +89,18 @@ private enum CombatStat { ) ), - CRIT_DAMAGE(15, ItemStatistic.CRIT_DAMAGE, new GUIMaterial("ddafb23efc57f251878e5328d11cb0eef87b79c87b254a7ec72296f9363ef7c"), + CRIT_DAMAGE(15, ItemStatistic.CRITICAL_DAMAGE, new GUIMaterial("ddafb23efc57f251878e5328d11cb0eef87b79c87b254a7ec72296f9363ef7c"), player -> { - double value = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRIT_DAMAGE); + double value = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRITICAL_DAMAGE); double damageMultiplier = 1D + value / 100D; - double critChance = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRIT_CHANCE); + double critChance = player.getStatistics().allStatistics().getOverall(ItemStatistic.CRITICAL_CHANCE); return List.of( "§7Critical Damage multiplies the damage ", "§7that you deal when you land a ", "§7Critical Hit.", " ", - "§7Damage Multiplier: " + ItemStatistic.CRIT_DAMAGE.getDisplayColor() + StringUtility.decimalify(damageMultiplier, 1) + "x", - "§7Critical Chance: " + ItemStatistic.CRIT_DAMAGE.getDisplayColor() + StringUtility.decimalify(critChance, 1) + "%", + "§7Damage Multiplier: " + ItemStatistic.CRITICAL_DAMAGE.getDisplayColor() + StringUtility.decimalify(damageMultiplier, 1) + "x", + "§7Critical Chance: " + ItemStatistic.CRITICAL_DAMAGE.getDisplayColor() + StringUtility.decimalify(critChance, 1) + "%", " " ); } @@ -319,7 +319,7 @@ public ItemStack.Builder getItem(HypixelPlayer p) { PlayerStatistics statistics = player.getStatistics(); List lore = new ArrayList<>(List.of("§7Gives you a better chance at", "§7fighting strong monsters. ", " ")); List stats = new ArrayList<>(List.of(ItemStatistic.HEALTH, ItemStatistic.DEFENSE, ItemStatistic.STRENGTH, ItemStatistic.INTELLIGENCE, - ItemStatistic.CRIT_CHANCE, ItemStatistic.CRIT_DAMAGE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.TRUE_DEFENSE, + ItemStatistic.CRITICAL_CHANCE, ItemStatistic.CRITICAL_DAMAGE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.TRUE_DEFENSE, ItemStatistic.FEROCITY, ItemStatistic.HEALTH_REGENERATION, ItemStatistic.VITALITY, ItemStatistic.MENDING, ItemStatistic.SWING_RANGE)); statistics.allStatistics().getOverall().forEach((statistic, value) -> { diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java index 320bdc642..b54371643 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemConfigParser.java @@ -17,6 +17,7 @@ import net.swofty.type.skyblockgeneric.item.handlers.pet.KatUpgrade; import net.swofty.type.skyblockgeneric.minion.MinionIngredient; import net.swofty.type.skyblockgeneric.utility.RarityValue; +import net.swofty.type.skyblockgeneric.utility.RecipeParser; import net.swofty.type.skyblockgeneric.utility.groups.EnchantItemGroups; import org.jetbrains.annotations.Nullable; import org.tinylog.Logger; @@ -47,7 +48,7 @@ public static ConfigurableSkyBlockItem parseItem(Map config) { SafeConfig statsConfig = safeConfig.getNested("default_statistics"); for (String key : statsConfig.getKeys()) { double value = statsConfig.getDouble(key, 0.0); - statistics.put(key, value); + statistics.put(key.toUpperCase(), value); } } @@ -158,12 +159,25 @@ yield new EnchantableComponent( ); } case "ENCHANTED" -> { - if (safeConfig.containsKey("recipe_type") && safeConfig.containsKey("item_id")) { + if (safeConfig.containsKey("recipes")) { + List> recipeConfigs = safeConfig.getMapList("recipes"); + List> recipes = new ArrayList<>(); + + for (Map recipeConfig : recipeConfigs) { + SkyBlockRecipe recipe = RecipeParser.parseRecipe(recipeConfig); + recipes.add(recipe); + } + + yield new EnchantedComponent(recipes); + } + else if (safeConfig.containsKey("recipe_type") && safeConfig.containsKey("item_id")) { SkyBlockRecipe.RecipeType type = SkyBlockRecipe.RecipeType.valueOf(safeConfig.getString("recipe_type")); String baseMaterial = safeConfig.getString("item_id"); yield new EnchantedComponent(type, itemId, baseMaterial); } - yield new EnchantedComponent(); + else { + yield new EnchantedComponent(); + } } case "EXTRA_RARITY" -> { String display = safeConfig.getString("display"); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java index 5b5baea4b..3bfed3310 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/ItemLore.java @@ -140,7 +140,7 @@ public void updateLore(@Nullable SkyBlockPlayer player) { addLoreLine(null); } - List itemStatistics = new ArrayList<>(List.of(ItemStatistic.DAMAGE, ItemStatistic.STRENGTH, ItemStatistic.CRIT_CHANCE, ItemStatistic.CRIT_DAMAGE, + List itemStatistics = new ArrayList<>(List.of(ItemStatistic.DAMAGE, ItemStatistic.STRENGTH, ItemStatistic.CRITICAL_CHANCE, ItemStatistic.CRITICAL_DAMAGE, ItemStatistic.SEA_CREATURE_CHANCE, ItemStatistic.BONUS_ATTACK_SPEED, ItemStatistic.ABILITY_DAMAGE, ItemStatistic.HEALTH, ItemStatistic.DEFENSE, ItemStatistic.SPEED, ItemStatistic.INTELLIGENCE, ItemStatistic.MAGIC_FIND, ItemStatistic.PET_LUCK, ItemStatistic.TRUE_DEFENSE, ItemStatistic.HEALTH_REGENERATION, ItemStatistic.MENDING, ItemStatistic.VITALITY, ItemStatistic.FEROCITY, ItemStatistic.MINING_SPEED, ItemStatistic.MINING_FORTUNE, diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/EnchantedComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/EnchantedComponent.java index 61de37413..48df948ba 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/EnchantedComponent.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/EnchantedComponent.java @@ -8,15 +8,31 @@ import java.util.List; public class EnchantedComponent extends SkyBlockItemComponent { + private CraftableComponent craftableComponent; + public EnchantedComponent(SkyBlockRecipe.RecipeType type, String enchantedItem, String nonEnchantedID) { addInheritedComponent(new DisableAnimationComponent( List.of(ItemAnimation.EAT) )); - addInheritedComponent(new CraftableComponent(getStandardEnchantedRecipe( + + // Create a standard enchanted recipe + SkyBlockRecipe recipe = SkyBlockRecipe.getStandardEnchantedRecipe( type, - ItemType.valueOf(enchantedItem), - ItemType.valueOf(nonEnchantedID) - ), true)); + ItemType.valueOf(nonEnchantedID), // Base material + ItemType.valueOf(enchantedItem) // Result + ); + + this.craftableComponent = new CraftableComponent(List.of(recipe), false); + addInheritedComponent(craftableComponent); + } + + public EnchantedComponent(List> customRecipes) { + addInheritedComponent(new DisableAnimationComponent( + List.of(ItemAnimation.EAT) + )); + + this.craftableComponent = new CraftableComponent(customRecipes, false); + addInheritedComponent(craftableComponent); } public EnchantedComponent() { @@ -25,7 +41,7 @@ public EnchantedComponent() { )); } - public SkyBlockRecipe getStandardEnchantedRecipe(SkyBlockRecipe.RecipeType type, ItemType enchantedItem, ItemType nonEnchantedID) { - return SkyBlockRecipe.getStandardEnchantedRecipe(type, enchantedItem, nonEnchantedID); + public List> getRecipes() { + return craftableComponent != null ? craftableComponent.getRecipes() : List.of(); } } \ No newline at end of file diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java index 64db255f9..d587c0c84 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/PetComponent.java @@ -97,10 +97,10 @@ public List getAbsoluteLore(@Nullable SkyBlockPlayer player, SkyBlockIte addPropertyInt("Magic Find", (baseStatistics.getOverall(ItemStatistic.MAGIC_FIND) + getPerLevelStatistics(rarity).getOverall(ItemStatistic.MAGIC_FIND) * 100.0 * level), lore); - addPropertyPercent("Crit Damage", (baseStatistics.getOverall(ItemStatistic.CRIT_DAMAGE) + - getPerLevelStatistics(rarity).getOverall(ItemStatistic.CRIT_DAMAGE) * level), lore); - addPropertyPercent("Crit Chance", (baseStatistics.getOverall(ItemStatistic.CRIT_CHANCE) + - getPerLevelStatistics(rarity).getOverall(ItemStatistic.CRIT_CHANCE) * level), lore); + addPropertyPercent("Crit Damage", (baseStatistics.getOverall(ItemStatistic.CRITICAL_DAMAGE) + + getPerLevelStatistics(rarity).getOverall(ItemStatistic.CRITICAL_DAMAGE) * level), lore); + addPropertyPercent("Crit Chance", (baseStatistics.getOverall(ItemStatistic.CRITICAL_CHANCE) + + getPerLevelStatistics(rarity).getOverall(ItemStatistic.CRITICAL_CHANCE) * level), lore); addPropertyPercent("Health", (baseStatistics.getOverall(ItemStatistic.HEALTH) + getPerLevelStatistics(rarity).getOverall(ItemStatistic.HEALTH) * level), lore); addPropertyInt("Strength", baseStatistics.getOverall(ItemStatistic.STRENGTH) + diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/MinionRegistry.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/MinionRegistry.java index 753c9110e..68178e410 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/MinionRegistry.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/minion/MinionRegistry.java @@ -20,7 +20,7 @@ public enum MinionRegistry { GOLD(MinionGold.class, ItemType.GOLD_MINION), LAPIS(MinionLapis.class, ItemType.LAPIS_MINION), IRON(MinionIron.class, ItemType.IRON_MINION), - ENDSTONE(MinionEndstone.class, ItemType.ENDSTONE_MINION), + ENDSTONE(MinionEndstone.class, ItemType.END_STONE_MINION), REDSTONE(MinionRedstone.class, ItemType.REDSTONE_MINION), EMERALD(MinionEmerald.class, ItemType.EMERALD_MINION), ICE(MinionIce.class, ItemType.ICE_MINION), diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/potion/PotionEffectType.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/potion/PotionEffectType.java index da412154b..e0556e1f6 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/potion/PotionEffectType.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/potion/PotionEffectType.java @@ -33,8 +33,8 @@ public enum PotionEffectType { CRITICAL("Critical", PotionEffectCategory.BUFF, 4, 180, level -> ItemStatistics.builder() - .withBase(ItemStatistic.CRIT_CHANCE, 10.0 + (level - 1) * 5.0) // +10 to +25% Crit Chance - .withBase(ItemStatistic.CRIT_DAMAGE, 10.0 + (level - 1) * 10.0) // +10 to +40% Crit Damage + .withBase(ItemStatistic.CRITICAL_CHANCE, 10.0 + (level - 1) * 5.0) // +10 to +25% Crit Chance + .withBase(ItemStatistic.CRITICAL_DAMAGE, 10.0 + (level - 1) * 10.0) // +10 to +40% Crit Damage .build(), null), @@ -105,7 +105,7 @@ public enum PotionEffectType { SPIRIT("Spirit", PotionEffectCategory.BUFF, 4, 180, level -> ItemStatistics.builder() .withBase(ItemStatistic.SPEED, 10.0 * level) // +10 to +40 Speed - .withBase(ItemStatistic.CRIT_DAMAGE, 10.0 * level) // +10 to +40 Crit Damage + .withBase(ItemStatistic.CRITICAL_DAMAGE, 10.0 * level) // +10 to +40 Crit Damage .build(), null), @@ -342,7 +342,7 @@ public String getDescription(int level) { return switch (this) { case SPEED -> "Increases §aSpeed §7by §a" + stats.getOverall(ItemStatistic.SPEED).intValue() + "§7."; case STRENGTH -> "Increases §cStrength §7by §c" + stats.getOverall(ItemStatistic.STRENGTH).intValue() + "§7."; - case CRITICAL -> "Grants §9+" + stats.getOverall(ItemStatistic.CRIT_CHANCE).intValue() + "% Crit Chance §7and §9+" + stats.getOverall(ItemStatistic.CRIT_DAMAGE).intValue() + "% Crit Damage§7."; + case CRITICAL -> "Grants §9+" + stats.getOverall(ItemStatistic.CRITICAL_CHANCE).intValue() + "% Crit Chance §7and §9+" + stats.getOverall(ItemStatistic.CRITICAL_DAMAGE).intValue() + "% Crit Damage§7."; case HASTE -> "Increases §6Mining Speed §7by §6" + stats.getOverall(ItemStatistic.MINING_SPEED).intValue() + "§7."; case REGENERATION -> "Increases §cHealth Regen §7by §c" + stats.getOverall(ItemStatistic.HEALTH_REGENERATION).intValue() + "§7."; case RESISTANCE -> "Increases §aDefense §7by §a" + stats.getOverall(ItemStatistic.DEFENSE).intValue() + "§7."; @@ -364,7 +364,7 @@ public String getDescription(int level) { case WATER_BREATHING -> "Allows you to breathe underwater."; case JUMP_BOOST -> "Increases jump height."; case INVISIBILITY -> "Makes you invisible to mobs."; - case SPIRIT -> "Increases §cCrit Damage §7by §c" + stats.getOverall(ItemStatistic.CRIT_DAMAGE).intValue() + "§7."; + case SPIRIT -> "Increases §cCrit Damage §7by §c" + stats.getOverall(ItemStatistic.CRITICAL_DAMAGE).intValue() + "§7."; case DODGE, AGILITY -> "Grants §a" + (int) getDodgeChance(level) + "% §7chance to dodge attacks."; case STUN -> "Grants §e" + (int) getStunChance(level) + "% §7chance to stun enemies."; case AWKWARD, THICK, MUNDANE, WATER -> "No effect."; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/tabmodules/AccountInformationModule.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/tabmodules/AccountInformationModule.java index 1a1de1c0d..5ad12055e 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/tabmodules/AccountInformationModule.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/tabmodules/AccountInformationModule.java @@ -47,11 +47,11 @@ public List getEntries(SkyBlockPlayer player) { entries.add(new TablistEntry(" Strength: " + ItemStatistic.STRENGTH.getDisplayColor() + ItemStatistic.STRENGTH.getSymbol() + playerStatistics.getOverall(ItemStatistic.STRENGTH), TablistSkinRegistry.GRAY)); - entries.add(new TablistEntry(" Crit Chance: " + ItemStatistic.CRIT_CHANCE.getDisplayColor() + - ItemStatistic.CRIT_CHANCE.getSymbol() + playerStatistics.getOverall(ItemStatistic.CRIT_CHANCE), + entries.add(new TablistEntry(" Crit Chance: " + ItemStatistic.CRITICAL_CHANCE.getDisplayColor() + + ItemStatistic.CRITICAL_CHANCE.getSymbol() + playerStatistics.getOverall(ItemStatistic.CRITICAL_CHANCE), TablistSkinRegistry.GRAY)); - entries.add(new TablistEntry(" Crit Damage: " + ItemStatistic.CRIT_DAMAGE.getDisplayColor() + - ItemStatistic.CRIT_DAMAGE.getSymbol() + playerStatistics.getOverall(ItemStatistic.CRIT_DAMAGE), + entries.add(new TablistEntry(" Crit Damage: " + ItemStatistic.CRITICAL_DAMAGE.getDisplayColor() + + ItemStatistic.CRITICAL_DAMAGE.getSymbol() + playerStatistics.getOverall(ItemStatistic.CRITICAL_DAMAGE), TablistSkinRegistry.GRAY)); entries.add(new TablistEntry(" Attack Speed: " + ItemStatistic.BONUS_ATTACK_SPEED.getDisplayColor() + ItemStatistic.BONUS_ATTACK_SPEED.getSymbol() + playerStatistics.getOverall(ItemStatistic.BONUS_ATTACK_SPEED), diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/statistics/PlayerStatistics.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/statistics/PlayerStatistics.java index e14def812..7c56ef983 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/statistics/PlayerStatistics.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/statistics/PlayerStatistics.java @@ -374,13 +374,13 @@ public static Map.Entry runPrimaryDamageFormula(ItemStatistics private static Map.Entry runPrimaryDamageFormula(ItemStatistics originStatistics, ItemStatistics enemyStatistics, LivingEntity enemy) { boolean isCrit = false; - double critChance = originStatistics.getBase(ItemStatistic.CRIT_CHANCE); + double critChance = originStatistics.getBase(ItemStatistic.CRITICAL_CHANCE); if (Math.random() <= (critChance / 100)) isCrit = true; double baseDamage = originStatistics.getOverall(ItemStatistic.DAMAGE); double strength = originStatistics.getOverall(ItemStatistic.STRENGTH); - double critDamage = originStatistics.getOverall(ItemStatistic.CRIT_DAMAGE); + double critDamage = originStatistics.getOverall(ItemStatistic.CRITICAL_DAMAGE); double strengthDamage = (1 + (strength / 100)); double criticalDamage = isCrit ? 1 + (critDamage / 100) : 1; diff --git a/type.skywarsconfigurator/src/main/java/net/swofty/type/skywarsconfigurator/TypeSkywarsConfiguratorLoader.java b/type.skywarsconfigurator/src/main/java/net/swofty/type/skywarsconfigurator/TypeSkywarsConfiguratorLoader.java index 6f92feecd..1878e119e 100644 --- a/type.skywarsconfigurator/src/main/java/net/swofty/type/skywarsconfigurator/TypeSkywarsConfiguratorLoader.java +++ b/type.skywarsconfigurator/src/main/java/net/swofty/type/skywarsconfigurator/TypeSkywarsConfiguratorLoader.java @@ -1,6 +1,7 @@ package net.swofty.type.skywarsconfigurator; import lombok.Getter; +import lombok.Setter; import net.minestom.server.MinecraftServer; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.GameMode; @@ -34,6 +35,7 @@ public class TypeSkywarsConfiguratorLoader implements HypixelTypeLoader { @Getter private static InstanceContainer mainInstance; + @Setter @Getter private static MapConfigurationSession currentSession; @@ -80,10 +82,6 @@ public void afterInitialize(MinecraftServer server) { Logger.info("SkyWars Configurator loaded. Use /swconfig to start."); } - public static void setCurrentSession(MapConfigurationSession session) { - currentSession = session; - } - @Override public List getRequiredServices() { return List.of(); @@ -139,9 +137,4 @@ public List getProxyRedisListeners() { public @Nullable CustomWorlds getMainInstance() { return null; } - - @Override - public List> getAdditionalDataHandlers() { - return List.of(); - } } From 7ca7b441f1e3f2f8ca3bbe5830b871d64834cd2a Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sun, 4 Jan 2026 18:45:49 +0100 Subject: [PATCH 3/3] added some recipes --- .../commons/skyblock/item/ItemType.java | 1 + .../skyblock/collections/farming.yml | 18 ++++ configuration/skyblock/collections/mining.yml | 55 +++++++++--- .../skyblock/items/accessories/emerald.yml | 19 ++++ .../skyblock/items/accessories/feather.yml | 62 ++++++++++++- .../skyblock/items/accessories/haste.yml | 21 ++++- .../items/accessories/personalcompactor.yml | 90 ++++++++++++++++++- .../items/accessories/personaldeletor.yml | 90 ++++++++++++++++++- .../skyblock/items/accessories/potion.yml | 56 +++++++++++- .../skyblock/items/accessories/scarfs.yml | 30 +++++++ .../items/accessories/seacreatures.yml | 6 +- .../skyblock/items/armor/prospecting.yml | 8 +- .../skyblock/items/miscellaneous/upgrade.yml | 26 ++++++ 13 files changed, 459 insertions(+), 23 deletions(-) diff --git a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java index 842c8502a..14bb11028 100644 --- a/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java +++ b/commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java @@ -450,6 +450,7 @@ public enum ItemType { DIAMOND_SPREADING(Material.DIAMOND, Rarity.RARE), MINION_EXPANDER(Material.COMMAND_BLOCK, Rarity.RARE), MITHRIL_INFUSION(Material.PLAYER_HEAD, Rarity.UNCOMMON), + HYPER_FURNACE(Material.FURNACE, Rarity.UNCOMMON), /** * Minion Fuels diff --git a/configuration/skyblock/collections/farming.yml b/configuration/skyblock/collections/farming.yml index b04d3577a..33f61b22e 100644 --- a/configuration/skyblock/collections/farming.yml +++ b/configuration/skyblock/collections/farming.yml @@ -278,6 +278,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: FEATHER_TALISMAN - amount: 2500 rewards: - type: XP @@ -296,6 +299,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: FEATHER_RING - amount: 25000 rewards: - type: XP @@ -306,6 +312,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: FEATHER_ARTIFACT - itemType: LEATHER rewards: - amount: 50 @@ -596,6 +605,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: POTION_AFFINITY_TALISMAN - amount: 1000 rewards: - type: XP @@ -622,6 +634,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: RING_POTION_AFFINITY - amount: 25000 rewards: - type: XP @@ -635,6 +650,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ARTIFACT_POTION_AFFINITY - amount: 75000 rewards: - type: XP diff --git a/configuration/skyblock/collections/mining.yml b/configuration/skyblock/collections/mining.yml index dd5db7346..13954128d 100644 --- a/configuration/skyblock/collections/mining.yml +++ b/configuration/skyblock/collections/mining.yml @@ -52,21 +52,15 @@ collections: xp: 4 - type: RECIPE_UNLOCK data: - unlockedItemType: MINER_OUTFIT_HELMET - - type: RECIPE_UNLOCK - data: - unlockedItemType: MINER_OUTFIT_CHESTPLATE - - type: RECIPE_UNLOCK - data: - unlockedItemType: MINER_OUTFIT_LEGGINGS - - type: RECIPE_UNLOCK - data: - unlockedItemType: MINER_OUTFIT_BOOTS + unlockedItemType: HASTE_RING - amount: 25000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: HYPER_FURNACE - amount: 40000 rewards: - type: XP @@ -74,7 +68,7 @@ collections: xp: 4 - type: RECIPE_UNLOCK data: - unlockedItemType: HASTE_RING + unlockedItemType: HASTE_ARTIFACT - amount: 70000 rewards: - type: XP @@ -441,6 +435,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: EMERALD_RING - amount: 15000 rewards: - type: XP @@ -860,6 +857,18 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_HELMET + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_CHESTPLATE + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_LEGGINGS + - type: RECIPE_UNLOCK + data: + unlockedItemType: MINER_OUTFIT_BOOTS - amount: 250 rewards: - type: XP @@ -910,21 +919,33 @@ collections: - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_HOPPER + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_DELETOR_4000 - amount: 100000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_DELETOR_5000 - amount: 200000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_DELETOR_6000 - amount: 400000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_DELETOR_7000 - itemType: MITHRIL rewards: - amount: 50 @@ -1302,6 +1323,9 @@ collections: - type: CUSTOM_AWARD data: customAward: ACCESSORY_BAG_UPGRADE_2 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_COMPACTOR_4000 - amount: 200000 rewards: - type: XP @@ -1318,6 +1342,9 @@ collections: - type: CUSTOM_AWARD data: customAward: ACCESSORY_BAG_UPGRADE_4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_COMPACTOR_5000 - amount: 600000 rewards: - type: XP @@ -1334,6 +1361,9 @@ collections: - type: CUSTOM_AWARD data: customAward: ACCESSORY_BAG_UPGRADE_6 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_COMPACTOR_6000 - amount: 1000000 rewards: - type: XP @@ -1342,6 +1372,9 @@ collections: - type: CUSTOM_AWARD data: customAward: ACCESSORY_BAG_UPGRADE_7 + - type: RECIPE_UNLOCK + data: + unlockedItemType: PERSONAL_COMPACTOR_7000 - amount: 1200000 rewards: - type: XP diff --git a/configuration/skyblock/items/accessories/emerald.yml b/configuration/skyblock/items/accessories/emerald.yml index 2e30243ed..e6af741f4 100644 --- a/configuration/skyblock/items/accessories/emerald.yml +++ b/configuration/skyblock/items/accessories/emerald.yml @@ -11,6 +11,25 @@ items: - id: SELLABLE value: 7600 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - AAA + ingredients: + A: + type: ENCHANTED_EMERALD + amount: 4 + O: + type: AIR + amount: 1 + result: + type: EMERALD_RING + amount: 1 - id: EMERALD_ARTIFACT material: PLAYER_HEAD diff --git a/configuration/skyblock/items/accessories/feather.yml b/configuration/skyblock/items/accessories/feather.yml index e51c7f673..6247791fc 100644 --- a/configuration/skyblock/items/accessories/feather.yml +++ b/configuration/skyblock/items/accessories/feather.yml @@ -10,6 +10,22 @@ items: - id: SELLABLE value: 160 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - AAA + - AAA + - AAA + ingredients: + A: + type: FEATHER + amount: 12 + result: + type: FEATHER_TALISMAN + amount: 1 - id: FEATHER_RING material: PLAYER_HEAD @@ -23,6 +39,28 @@ items: - id: SELLABLE value: 1800 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - ABA + - AOA + - AAA + ingredients: + A: + type: ENCHANTED_FEATHER + amount: 1 + B: + type: FEATHER_TALISMAN + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FEATHER_RING + amount: 1 - id: FEATHER_ARTIFACT material: PLAYER_HEAD @@ -35,4 +73,26 @@ items: texture: da239e8b52ed91fe518d7c690b03de9dc69846a8d5c208ac1c102edd68d9ca18 - id: SELLABLE value: 32000 - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: FARMING + pattern: + - OAO + - ABA + - OAO + ingredients: + A: + type: ENCHANTED_FEATHER + amount: 32 + B: + type: FEATHER_RING + amount: 1 + O: + type: AIR + amount: 1 + result: + type: FEATHER_ARTIFACT + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/haste.yml b/configuration/skyblock/items/accessories/haste.yml index 17f442f8b..fce346203 100644 --- a/configuration/skyblock/items/accessories/haste.yml +++ b/configuration/skyblock/items/accessories/haste.yml @@ -44,4 +44,23 @@ items: - id: ACCESSORY - id: SKULL_HEAD texture: 2fe7a882ffe0d0dd245d91bd8e6dcc1ed450ae13880b12276fbaf66d4a4164c9 - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 32 + B: + type: HASTE_RING + amount: 1 + result: + type: HASTE_ARTIFACT + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/personalcompactor.yml b/configuration/skyblock/items/accessories/personalcompactor.yml index f2deb33c6..61c36f110 100644 --- a/configuration/skyblock/items/accessories/personalcompactor.yml +++ b/configuration/skyblock/items/accessories/personalcompactor.yml @@ -8,6 +8,28 @@ items: - id: ACCESSORY - id: ENCHANTED - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_REDSTONE + amount: 64 + B: + type: SUPER_COMPACTOR_3000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_COMPACTOR_4000 + amount: 1 - id: PERSONAL_COMPACTOR_5000 material: DROPPER @@ -18,6 +40,28 @@ items: - id: ACCESSORY - id: ENCHANTED - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_REDSTONE_BLOCK + amount: 2 + B: + type: PERSONAL_COMPACTOR_4000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_COMPACTOR_5000 + amount: 1 - id: PERSONAL_COMPACTOR_6000 material: DROPPER @@ -28,6 +72,28 @@ items: - id: ACCESSORY - id: ENCHANTED - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_REDSTONE_BLOCK + amount: 4 + B: + type: PERSONAL_COMPACTOR_5000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_COMPACTOR_6000 + amount: 1 - id: PERSONAL_COMPACTOR_7000 material: DROPPER @@ -37,4 +103,26 @@ items: display_name: Personal Compactor 7000 - id: ACCESSORY - id: ENCHANTED - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_REDSTONE_BLOCK + amount: 8 + B: + type: PERSONAL_COMPACTOR_6000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_COMPACTOR_7000 + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/personaldeletor.yml b/configuration/skyblock/items/accessories/personaldeletor.yml index 70e8f4885..6691f68e8 100644 --- a/configuration/skyblock/items/accessories/personaldeletor.yml +++ b/configuration/skyblock/items/accessories/personaldeletor.yml @@ -7,6 +7,28 @@ items: display_name: Personal Deletor 4000 - id: ACCESSORY - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - ACA + ingredients: + A: + type: ENCHANTED_IRON_INGOT + amount: 16 + B: + type: ENCHANTED_LAVA_BUCKET + amount: 1 + C: + type: ENCHANTED_REDSTONE_BLOCK + amount: 1 + result: + type: PERSONAL_DELETOR_4000 + amount: 1 - id: PERSONAL_DELETOR_5000 material: DISPENSER @@ -16,6 +38,28 @@ items: display_name: Personal Deletor 5000 - id: ACCESSORY - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_IRON_INGOT + amount: 32 + B: + type: PERSONAL_DELETOR_4000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_DELETOR_5000 + amount: 1 - id: PERSONAL_DELETOR_6000 material: DISPENSER @@ -25,6 +69,28 @@ items: display_name: Personal Deletor 6000 - id: ACCESSORY - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_IRON_INGOT + amount: 64 + B: + type: PERSONAL_DELETOR_5000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_DELETOR_6000 + amount: 1 - id: PERSONAL_DELETOR_7000 material: DISPENSER @@ -33,4 +99,26 @@ items: - id: CUSTOM_DISPLAY_NAME display_name: Personal Deletor 7000 - id: ACCESSORY - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AOA + - ABA + ingredients: + A: + type: ENCHANTED_IRON_BLOCK + amount: 1 + B: + type: PERSONAL_DELETOR_6000 + amount: 1 + O: + type: AIR + amount: 1 + result: + type: PERSONAL_DELETOR_7000 + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/potion.yml b/configuration/skyblock/items/accessories/potion.yml index 310abfa22..1575227aa 100644 --- a/configuration/skyblock/items/accessories/potion.yml +++ b/configuration/skyblock/items/accessories/potion.yml @@ -10,6 +10,22 @@ items: - id: SELLABLE value: 192 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - AAA + - AAA + ingredients: + A: + type: NETHER_WART + amount: 16 + result: + type: POTION_AFFINITY_TALISMAN + amount: 1 - id: RING_POTION_AFFINITY material: PLAYER_HEAD @@ -23,6 +39,25 @@ items: - id: SELLABLE value: 2100 - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_NETHER_WART + amount: 1 + B: + type: POTION_AFFINITY_TALISMAN + amount: 1 + result: + type: RING_POTION_AFFINITY + amount: 1 - id: ARTIFACT_POTION_AFFINITY material: PLAYER_HEAD @@ -35,4 +70,23 @@ items: texture: 56f9119a1d1fb01bb97db89aeba56ff5ee112079e432a2b50fa3a80a8954db38 - id: SELLABLE value: 64000 - - id: NOT_FINISHED_YET \ No newline at end of file + - id: NOT_FINISHED_YET + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_NETHER_WART + amount: 32 + B: + type: RING_POTION_AFFINITY + amount: 1 + result: + type: ARTIFACT_POTION_AFFINITY + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/scarfs.yml b/configuration/skyblock/items/accessories/scarfs.yml index fc93ed27b..232b08241 100644 --- a/configuration/skyblock/items/accessories/scarfs.yml +++ b/configuration/skyblock/items/accessories/scarfs.yml @@ -26,6 +26,21 @@ items: - id: TALISMAN - id: SKULL_HEAD texture: 8ce4c87eb4dde27459e3e7f85921e7e57b11199260caa5ce63f139ee3d188c + - id: DEFAULT_CRAFTABLE + default-craftable: true + recipes: + - type: SHAPED + recipe-type: SPECIAL + pattern: + - AA + - AA + ingredients: + A: + type: SCARFS_STUDIES + amount: 1 + result: + type: SCARFS_THESIS + amount: 1 - id: SCARFS_GRIMOIRE material: PLAYER_HEAD @@ -41,3 +56,18 @@ items: - id: TALISMAN - id: SKULL_HEAD texture: bafb195cc75f31b619a077b7853653254ac18f220dc32d1412982ff437b4d57a + - id: DEFAULT_CRAFTABLE + default-craftable: true + recipes: + - type: SHAPED + recipe-type: SPECIAL + pattern: + - AA + - AA + ingredients: + A: + type: SCARFS_THESIS + amount: 1 + result: + type: SCARFS_GRIMOIRE + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/accessories/seacreatures.yml b/configuration/skyblock/items/accessories/seacreatures.yml index d864c3294..f112bf3b6 100644 --- a/configuration/skyblock/items/accessories/seacreatures.yml +++ b/configuration/skyblock/items/accessories/seacreatures.yml @@ -16,7 +16,7 @@ items: default-craftable: false recipes: - type: SHAPED - recipe-type: FARMING + recipe-type: FISHING pattern: - AAA - AAA @@ -47,7 +47,7 @@ items: default-craftable: false recipes: - type: SHAPED - recipe-type: FARMING + recipe-type: FISHING pattern: - ABA - ACA @@ -84,7 +84,7 @@ items: default-craftable: false recipes: - type: SHAPED - recipe-type: FARMING + recipe-type: FISHING pattern: - AAA - ABA diff --git a/configuration/skyblock/items/armor/prospecting.yml b/configuration/skyblock/items/armor/prospecting.yml index f8ea65743..9fb41ce18 100644 --- a/configuration/skyblock/items/armor/prospecting.yml +++ b/configuration/skyblock/items/armor/prospecting.yml @@ -31,7 +31,7 @@ items: - AOA ingredients: A: - type: ENCHANTED_COBBLESTONE + type: IRON_BLOCK amount: 1 O: type: AIR @@ -73,7 +73,7 @@ items: - AAA ingredients: A: - type: ENCHANTED_COBBLESTONE + type: IRON_BLOCK amount: 1 O: type: AIR @@ -115,7 +115,7 @@ items: - AOA ingredients: A: - type: ENCHANTED_COBBLESTONE + type: IRON_BLOCK amount: 1 O: type: AIR @@ -156,7 +156,7 @@ items: - AOA ingredients: A: - type: ENCHANTED_COBBLESTONE + type: IRON_BLOCK amount: 1 O: type: AIR diff --git a/configuration/skyblock/items/miscellaneous/upgrade.yml b/configuration/skyblock/items/miscellaneous/upgrade.yml index 574a4de54..d4aaea4e9 100644 --- a/configuration/skyblock/items/miscellaneous/upgrade.yml +++ b/configuration/skyblock/items/miscellaneous/upgrade.yml @@ -55,6 +55,32 @@ items: type: COMPACTOR amount: 1 + - id: HYPER_FURNACE + rarity: UNCOMMON + components: + - id: ENCHANTED + - id: NOT_FINISHED_YET + - id: TRACKED_UNIQUE + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_COBBLESTONE + amount: 8 + B: + type: ENCHANTED_COAL + amount: 8 + result: + type: HYPER_FURNACE + amount: 1 + - id: DIAMOND_SPREADING rarity: COMMON components: