From 6188124859d1c49711a9d3d54a504834c1456d72 Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Fri, 9 Jan 2026 22:57:44 +0100 Subject: [PATCH 1/4] more sacks --- .../commons/skyblock/item/ItemType.java | 26 +- .../skyblock/collections/farming.yml | 14 +- configuration/skyblock/collections/mining.yml | 12 + .../items/accessories/accessories.yml | 2 +- .../skyblock/items/compactedItems.yml | 72 ++- configuration/skyblock/items/sacks.yml | 523 +++++++++++++++++- .../items/vanilla/blocks/greenery/fern.yml | 4 +- .../items/vanilla/blocks/greenery/grass.yml | 4 +- .../skyblock/items/vanilla/items/crops.yml | 4 +- .../bazaar/BazaarCategories.java | 2 +- .../gui/inventories/sbmenu/bags/GUISack.java | 1 - .../item/components/SackComponent.java | 5 +- 12 files changed, 641 insertions(+), 28 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 14bb11028..0d6e7f380 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 @@ -371,6 +371,12 @@ public enum ItemType { SMALL_MINING_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON), MEDIUM_MINING_SACK(Material.PLAYER_HEAD, Rarity.RARE), LARGE_MINING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + LARGE_ENCHANTED_MINING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + + SMALL_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MEDIUM_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.RARE), + LARGE_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + LARGE_ENCHANTED_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC), /** * Runes @@ -541,7 +547,7 @@ public enum ItemType { IRON_HOE(Material.IRON_HOE, Rarity.COMMON), DIAMOND_HOE(Material.DIAMOND_HOE, Rarity.UNCOMMON), WHEAT(Material.WHEAT, Rarity.COMMON), - WHEAT_SEEDS(Material.WHEAT_SEEDS, Rarity.COMMON), + SEEDS(Material.WHEAT_SEEDS, Rarity.COMMON), WHEAT_CRYSTAL(Material.PLAYER_HEAD, Rarity.SPECIAL), FLOWER_CRYSTAL(Material.PLAYER_HEAD, Rarity.SPECIAL), CARROT_CRYSTAL(Material.PLAYER_HEAD, Rarity.SPECIAL), @@ -971,6 +977,12 @@ public enum ItemType { TITANIUM(Material.PLAYER_HEAD, Rarity.RARE), SULPHUR(Material.GLOWSTONE_DUST, Rarity.UNCOMMON), CONCENTRATED_STONE(Material.PLAYER_HEAD, Rarity.RARE), + GLACITE(Material.PACKED_ICE, Rarity.COMMON), + ENCHANTED_GLACITE(Material.PACKED_ICE, Rarity.UNCOMMON), + TUNGSTEN(Material.PLAYER_HEAD, Rarity.COMMON), + ENCHANTED_TUNGSTEN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + UMBER(Material.PLAYER_HEAD, Rarity.COMMON), + ENCHANTED_UMBER(Material.PLAYER_HEAD, Rarity.UNCOMMON), /** * Forge Items @@ -1015,6 +1027,8 @@ public enum ItemType { CORLEONITE(Material.PLAYER_HEAD, Rarity.EPIC), LANTERN(Material.PLAYER_HEAD, Rarity.RARE), INFINI_TORCH(Material.TORCH, Rarity.EPIC), + GLOSSY_GEMSTONE(Material.PURPLE_DYE, Rarity.EPIC), + REFINED_MINERAL(Material.LIGHT_BLUE_DYE, Rarity.COMMON), /** * Travel Scrolls @@ -1215,6 +1229,9 @@ public enum ItemType { DIAMOND_BOOTS(Material.DIAMOND_BOOTS, Rarity.UNCOMMON), APPLE(Material.APPLE, Rarity.COMMON), SLIME_BLOCK(Material.SLIME_BLOCK, Rarity.COMMON), + MOONFLOWER(Material.BLUE_ORCHID, Rarity.COMMON), + SUNFLOWER(Material.SUNFLOWER, Rarity.COMMON), + WILD_ROSE(Material.ROSE_BUSH, Rarity.COMMON), OAK_SAPLING(Material.OAK_SAPLING, Rarity.COMMON), SPRUCE_SAPLING(Material.SPRUCE_SAPLING, Rarity.COMMON), @@ -1697,7 +1714,6 @@ public enum ItemType { WITHER_ROSE(Material.WITHER_ROSE, Rarity.COMMON), CORNFLOWER(Material.CORNFLOWER, Rarity.COMMON), LILY_OF_THE_VALLEY(Material.LILY_OF_THE_VALLEY, Rarity.COMMON), - SUNFLOWER(Material.SUNFLOWER, Rarity.COMMON), BEETROOT(Material.BEETROOT, Rarity.COMMON), RED_TULIP(Material.RED_TULIP, Rarity.COMMON), ORANGE_TULIP(Material.ORANGE_TULIP, Rarity.COMMON), @@ -1867,6 +1883,12 @@ public enum ItemType { ENCHANTED_RED_SAND_CUBE(Material.PLAYER_HEAD, Rarity.RARE), ENCHANTED_BONE_MEAL(Material.BONE_MEAL, Rarity.COMMON), ENCHANTED_WHEAT(Material.WHEAT, Rarity.UNCOMMON), + ENCHANTED_MOONFLOWER(Material.BLUE_ORCHID, Rarity.UNCOMMON), + ENCHANTED_SUNFLOWER(Material.SUNFLOWER, Rarity.UNCOMMON), + ENCHANTED_WILD_ROSE(Material.ROSE_BUSH, Rarity.UNCOMMON), + COMPACTED_MOONFLOWER(Material.BLUE_ORCHID, Rarity.RARE), + COMPACTED_SUNFLOWER(Material.SUNFLOWER, Rarity.RARE), + COMPACTED_WILD_ROSE(Material.ROSE_BUSH, Rarity.RARE), ; public final Material material; diff --git a/configuration/skyblock/collections/farming.yml b/configuration/skyblock/collections/farming.yml index 33f61b22e..0f25a0921 100644 --- a/configuration/skyblock/collections/farming.yml +++ b/configuration/skyblock/collections/farming.yml @@ -65,11 +65,17 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SMALL_AGRONOMY_SACK - amount: 15000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MEDIUM_AGRONOMY_SACK - amount: 25000 rewards: - type: XP @@ -80,6 +86,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_AGRONOMY_SACK - amount: 100000 rewards: - type: XP @@ -88,6 +97,9 @@ collections: - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_HAY_BALE + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_ENCHANTED_AGRONOMY_SACK - itemType: CARROT rewards: - amount: 100 @@ -1005,7 +1017,7 @@ collections: - type: XP data: xp: 4 -- itemType: WHEAT_SEEDS +- itemType: SEEDS rewards: - amount: 50 rewards: diff --git a/configuration/skyblock/collections/mining.yml b/configuration/skyblock/collections/mining.yml index 13954128d..60cc84d5b 100644 --- a/configuration/skyblock/collections/mining.yml +++ b/configuration/skyblock/collections/mining.yml @@ -113,6 +113,9 @@ collections: - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_CHARCOAL + - type: RECIPE_UNLOCK + data: + unlockedItemType: SMALL_MINING_SACK - amount: 5000 rewards: - type: XP @@ -126,6 +129,9 @@ collections: - type: RECIPE_UNLOCK data: unlockedItemType: ENCHANTED_COAL_BLOCK + - type: RECIPE_UNLOCK + data: + unlockedItemType: MEDIUM_MINING_SACK - amount: 25000 rewards: - type: XP @@ -139,11 +145,17 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_MINING_SACK - amount: 100000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_ENCHANTED_MINING_SACK - itemType: GOLD_INGOT rewards: - amount: 50 diff --git a/configuration/skyblock/items/accessories/accessories.yml b/configuration/skyblock/items/accessories/accessories.yml index fa61b8f19..8342dcb3d 100644 --- a/configuration/skyblock/items/accessories/accessories.yml +++ b/configuration/skyblock/items/accessories/accessories.yml @@ -30,7 +30,7 @@ items: type: WHEAT amount: 8 B: - type: WHEAT_SEEDS + type: SEEDS amount: 1 result: type: FARMING_TALISMAN diff --git a/configuration/skyblock/items/compactedItems.yml b/configuration/skyblock/items/compactedItems.yml index 1b0646360..ce3ad9c22 100644 --- a/configuration/skyblock/items/compactedItems.yml +++ b/configuration/skyblock/items/compactedItems.yml @@ -1310,13 +1310,13 @@ items: value: 320 - id: ENCHANTED_SEEDS - material: WHEAT_SEEDS + material: SEEDS rarity: UNCOMMON default_statistics: {} components: - id: ENCHANTED recipe_type: FARMING - item_id: WHEAT_SEEDS + item_id: SEEDS - id: SELLABLE value: 480 @@ -1609,4 +1609,70 @@ items: - id: SELLABLE value: 256000.0 - id: SKULL_HEAD - texture: 8db711ff52eedda59c434bb03169763d7c40b5b89127778feacd63aa94dfc \ No newline at end of file + texture: 8db711ff52eedda59c434bb03169763d7c40b5b89127778feacd63aa94dfc + + - id: ENCHANTED_MOONFLOWER + material: BLUE_ORCHID + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: MOONFLOWER + - id: SELLABLE + value: 640 + + - id: ENCHANTED_SUNFLOWER + material: SUNFLOWER + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: SUNFLOWER + - id: SELLABLE + value: 640 + + - id: ENCHANTED_WILD_ROSE + material: ROSE_BUSH + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: WILD_ROSE + - id: SELLABLE + value: 640 + + - id: COMPACTED_MOONFLOWER + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_MOONFLOWER + - id: SELLABLE + value: 256000.0 + - id: SKULL_HEAD + texture: 469b3bac406b51ba0e76c2c218aa4d45fde9ea7c101c85fbd8106c92c4aa36dd + + - id: COMPACTED_SUNFLOWER + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_SUNFLOWER + - id: SELLABLE + value: 256000.0 + - id: SKULL_HEAD + texture: c4989d846862952f8ac844abbd4c1f77bf85e924c2bf98236f8d9253624d879f + + - id: ENCHANTED_WILD_ROSE + rarity: COMMON + components: + - id: ENCHANTED + recipe_type: FARMING + item_id: ENCHANTED_PUMPKIN + - id: SELLABLE + value: 256000.0 + - id: SKULL_HEAD + texture: a33051b7c69f51085cc43f0575139cd58afe2b83f33d2a203a5afc266c21019 \ No newline at end of file diff --git a/configuration/skyblock/items/sacks.yml b/configuration/skyblock/items/sacks.yml index a8ff37128..29d080693 100644 --- a/configuration/skyblock/items/sacks.yml +++ b/configuration/skyblock/items/sacks.yml @@ -1,10 +1,25 @@ items: - - id: LARGE_MINING_SACK + - id: SMALL_MINING_SACK rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aCoal§7, §aCobblestone§7, §aDiamond§7, §aEmerald§7, §aEnd Stone§7,' + - '§7§aFlint§7, §aGlacite§7, §aGlossy Gemstone§7, §aGlowstone Dust§7, §aGold' + - '§aIngot§7, §aGravel§7, §aHard Stone§7, §aIce§7, §aIron Ingot§7, §aLapis Lazuli§7,' + - '§7§aMithril§7, §aMycelium§7, §aNether Quartz§7, §aNetherrack§7, §aObsidian§7, §aOil' + - '§aBarrel§7, §aPlasma§7, §aRed Sand§7, §aRedstone Dust§7, §aRefined' + - '§aMineral§7, §aSand§7, §aSnow Block§7, §aStarfall§7, §aStone§7, §aSulphur§7,' + - '§7§aTitanium§7, §aTreasurite§7, §aTungsten§7, §aUmber§7, §aVolta' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' components: - id: SKULL_HEAD - texture: 915fcebbbe02fdb72acd2095d9edfcea095e604b3682db88963b5b83b2939b67 - - id: NOT_FINISHED_YET + texture: f07dff657d61f302c7d2e725265d17b64aa73642391964fb48fc15be950831d8 - id: SACK valid_items: - COAL @@ -13,11 +28,14 @@ items: - EMERALD - END_STONE - FLINT + - GLACITE - GLACITE_JEWEL + - GLOSSY_GEMSTONE - GLOWSTONE_DUST - GOLD_INGOT - GRAVEL - HARD_STONE + - ICE - IRON_INGOT - LAPIS_LAZULI - MITHRIL @@ -25,18 +43,63 @@ items: - QUARTZ - NETHERRACK - OBSIDIAN + - OIL_BARREL - PLASMA - RED_SAND - REDSTONE + - REFINED_MINERAL - SAND - max_capacity: 20160 - handler_id: LARGE_MINING_SACK_SACK + - SNOW_BLOCK + - STARFALL + - STONE + - SULPHUR + - TITANIUM + - TREASURITE + - TUNGSTEN + - UMBER + - VOLTA + max_capacity: 2240 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_COAL + amount: 2 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_MINING_SACK + amount: 1 + - id: MEDIUM_MINING_SACK rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aCoal§7, §aCobblestone§7, §aDiamond§7, §aEmerald§7, §aEnd Stone§7,' + - '§7§aFlint§7, §aGlacite§7, §aGlossy Gemstone§7, §aGlowstone Dust§7, §aGold' + - '§aIngot§7, §aGravel§7, §aHard Stone§7, §aIce§7, §aIron Ingot§7, §aLapis Lazuli§7,' + - '§7§aMithril§7, §aMycelium§7, §aNether Quartz§7, §aNetherrack§7, §aObsidian§7, §aOil' + - '§aBarrel§7, §aPlasma§7, §aRed Sand§7, §aRedstone Dust§7, §aRefined' + - '§aMineral§7, §aSand§7, §aSnow Block§7, §aStarfall§7, §aStone§7, §aSulphur§7,' + - '§7§aTitanium§7, §aTreasurite§7, §aTungsten§7, §aUmber§7, §aVolta' + - '' + - '§7Capacity: §e6,720 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' components: - id: SKULL_HEAD texture: 100b1bf8554985f3decf54886922ad20d144438564ef7a5b52ced71bc9dd04bb - - id: NOT_FINISHED_YET - id: SACK valid_items: - COAL @@ -45,11 +108,14 @@ items: - EMERALD - END_STONE - FLINT + - GLACITE - GLACITE_JEWEL + - GLOSSY_GEMSTONE - GLOWSTONE_DUST - GOLD_INGOT - GRAVEL - HARD_STONE + - ICE - IRON_INGOT - LAPIS_LAZULI - MITHRIL @@ -57,16 +123,63 @@ items: - QUARTZ - NETHERRACK - OBSIDIAN + - OIL_BARREL + - PLASMA - RED_SAND - REDSTONE + - REFINED_MINERAL + - SAND + - SNOW_BLOCK + - STARFALL + - STONE + - SULPHUR + - TITANIUM + - TREASURITE + - TUNGSTEN + - UMBER + - VOLTA max_capacity: 6720 - handler_id: MEDIUM_MINING_SACK_SACK - - id: SMALL_MINING_SACK + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_COAL + amount: 4 + B: + type: SMALL_MINING_SACK + amount: 1 + result: + type: MEDIUM_MINING_SACK + amount: 1 + + - id: LARGE_MINING_SACK rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aCoal§7, §aCobblestone§7, §aDiamond§7, §aEmerald§7, §aEnd Stone§7,' + - '§7§aFlint§7, §aGlacite§7, §aGlossy Gemstone§7, §aGlowstone Dust§7, §aGold' + - '§aIngot§7, §aGravel§7, §aHard Stone§7, §aIce§7, §aIron Ingot§7, §aLapis Lazuli§7,' + - '§7§aMithril§7, §aMycelium§7, §aNether Quartz§7, §aNetherrack§7, §aObsidian§7, §aOil' + - '§aBarrel§7, §aPlasma§7, §aRed Sand§7, §aRedstone Dust§7, §aRefined' + - '§aMineral§7, §aSand§7, §aSnow Block§7, §aStarfall§7, §aStone§7, §aSulphur§7,' + - '§7§aTitanium§7, §aTreasurite§7, §aTungsten§7, §aUmber§7, §aVolta' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' components: - id: SKULL_HEAD - texture: f07dff657d61f302c7d2e725265d17b64aa73642391964fb48fc15be950831d8 - - id: NOT_FINISHED_YET + texture: 915fcebbbe02fdb72acd2095d9edfcea095e604b3682db88963b5b83b2939b67 - id: SACK valid_items: - COAL @@ -75,11 +188,14 @@ items: - EMERALD - END_STONE - FLINT + - GLACITE - GLACITE_JEWEL + - GLOSSY_GEMSTONE - GLOWSTONE_DUST - GOLD_INGOT - GRAVEL - HARD_STONE + - ICE - IRON_INGOT - LAPIS_LAZULI - MITHRIL @@ -87,5 +203,390 @@ items: - QUARTZ - NETHERRACK - OBSIDIAN + - OIL_BARREL + - PLASMA + - RED_SAND + - REDSTONE + - REFINED_MINERAL + - SAND + - SNOW_BLOCK + - STARFALL + - STONE + - SULPHUR + - TITANIUM + - TREASURITE + - TUNGSTEN + - UMBER + - VOLTA + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_COAL + amount: 8 + B: + type: MEDIUM_MINING_SACK + amount: 1 + result: + type: LARGE_MINING_SACK + amount: 1 + + - id: LARGE_ENCHANTED_MINING_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§7§aCoal§7, §aCobblestone§7, §aDiamond§7, §aEmerald§7, §aEnd Stone§7,' + - '§7§aFlint§7, §aGlacite§7, §aGlowstone Dust§7, §aGold Ingot§7, §aHard' + - '§aStone§7, §aIron Ingot§7, §aLapis Lazuli§7, §aMithril§7, §aMycelium§7,' + - '§7§aNether Quartz§7, §aNetherrack§7, §aObsidian§7, §aRed Sand§7,' + - '§7§aRedstone Dust§7, §aSand§7, §aSulphur§7, §aTitanium§7,' + - '§7§aTungsten§7, §aUmber' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: eedc69fefad184ee8c9186928da982addfd783bed98d95083408bf419e0cccd0 + - id: SACK + valid_items: + - CONCENTRATED_STONE + - ENCHANTED_COAL + - ENCHANTED_COAL_BLOCK + - ENCHANTED_COBBLESTONE + - ENCHANTED_DIAMOND + - ENCHANTED_DIAMOND_BLOCK + - ENCHANTED_EMERALD + - ENCHANTED_EMERALD_BLOCK + - ENCHANTED_END_STONE + - ENCHANTED_FLINT + - ENCHANTED_GLACITE + - ENCHANTED_GLOWSTONE + - ENCHANTED_GLOWSTONE_DUST + - ENCHANTED_GOLD_BLOCK + - ENCHANTED_GOLD_INGOT + - ENCHANTED_HARD_STONE + - ENCHANTED_ICE + - ENCHANTED_IRON_BLOCK + - ENCHANTED_IRON_INGOT + - ENCHANTED_LAPIS_LAZULI + - ENCHANTED_LAPIS_LAZULI_BLOCK + - ENCHANTED_MITHRIL + - ENCHANTED_MYCELIUM + - ENCHANTED_MYCELIUM_CUBE + - ENCHANTED_QUARTZ + - ENCHANTED_NETHERRACK + - ENCHANTED_OBSIDIAN + - ENCHANTED_PACKED_ICE + - ENCHANTED_QUARTZ_BLOCK + - ENCHANTED_RED_SAND + - ENCHANTED_RED_SAND_CUBE + - ENCHANTED_REDSTONE_BLOCK + - ENCHANTED_REDSTONE + - ENCHANTED_SAND + - ENCHANTED_SNOW_BLOCK + - ENCHANTED_SULPHUR + - ENCHANTED_SULPHUR_CUBE + - ENCHANTED_TITANIUM + - ENCHANTED_TUNGSTEN + - ENCHANTED_UMBER + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_COAL + amount: 16 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_MINING_SACK + amount: 1 + + - id: SMALL_AGRONOMY_SACK + rarity: UNCOMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 2ab879e1e590041146bc78c018af5877d39e5475eb7db368fcaf2acda373833d + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE max_capacity: 2240 - handler_id: SMALL_MINING_SACK_SACK + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 16 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_AGRONOMY_SACK + amount: 1 + + - id: MEDIUM_AGRONOMY_SACK + rarity: RARE + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e6,720 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 294c8341a535f80b3f43c5c243d03006bd325c9e96ff3ab957ccc37062830ac6 + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE + max_capacity: 6720 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 32 + B: + type: SMALL_AGRONOMY_SACK + amount: 1 + result: + type: MEDIUM_AGRONOMY_SACK + amount: 1 + + - id: LARGE_AGRONOMY_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: ef835b8941fe319931749b87fe8e84c5d1f4a271b5fbce5e700a60004d881f79 + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 64 + B: + type: MEDIUM_AGRONOMY_SACK + amount: 1 + result: + type: LARGE_AGRONOMY_SACK + amount: 1 + + - id: LARGE_ENCHANTED_AGRONOMY_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§7§aBrown Mushroom§7, §aCactus§7, §aCarrot§7, §aCocoa Beans§7,' + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPotato§7,' + - '§7§aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aWheat' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 184d2ff1e177357574f9f71e19397fff3a210a94e78c0d2a4360cc5df1eb807b + - id: SACK + valid_items: + - BOX_OF_SEEDS + - COMPACTED_MOONFLOWER + - COMPACTED_SUNFLOWER + - COMPACTED_WILD_ROSE + - ENCHANTED_BAKED_POTATO + - ENCHANTED_BREAD + - ENCHANTED_BROWN_MUSHROOM + - ENCHANTED_BROWN_MUSHROOM_BLOCK + - ENCHANTED_CACTUS + - ENCHANTED_CACTUS_GREEN + - ENCHANTED_CARROT + - ENCHANTED_COCOA_BEANS + - ENCHANTED_COOKIE + - ENCHANTED_GOLDEN_CARROT + - ENCHANTED_HAY_BALE + - ENCHANTED_MELON_BLOCK + - ENCHANTED_MELON + - ENCHANTED_MOONFLOWER + - ENCHANTED_NETHER_WART + - ENCHANTED_POISONOUS_POTATO + - ENCHANTED_POTATO + - ENCHANTED_PUMPKIN + - ENCHANTED_RED_MUSHROOM + - ENCHANTED_RED_MUSHROOM_BLOCK + - ENCHANTED_SEEDS + - ENCHANTED_SUGAR + - ENCHANTED_SUGAR_CANE + - ENCHANTED_SUNFLOWER + - ENCHANTED_WHEAT + - ENCHANTED_WILD_ROSE + - MUTANT_NETHER_WART + - POLISHED_PUMPKIN + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_HAY_BALE + amount: 3 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_AGRONOMY_SACK + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/vanilla/blocks/greenery/fern.yml b/configuration/skyblock/items/vanilla/blocks/greenery/fern.yml index b84c4be8d..4c92200b0 100644 --- a/configuration/skyblock/items/vanilla/blocks/greenery/fern.yml +++ b/configuration/skyblock/items/vanilla/blocks/greenery/fern.yml @@ -13,7 +13,7 @@ items: amount: 1 - conditions: drops: - - item: WHEAT_SEEDS + - item: SEEDS chance: 0.125 amount: 1 - id: PLACEABLE @@ -34,7 +34,7 @@ items: amount: 2 - conditions: drops: - - item: WHEAT_SEEDS + - item: SEEDS chance: 0.125 amount: 1 - id: PLACEABLE diff --git a/configuration/skyblock/items/vanilla/blocks/greenery/grass.yml b/configuration/skyblock/items/vanilla/blocks/greenery/grass.yml index 91463f630..a1c731854 100644 --- a/configuration/skyblock/items/vanilla/blocks/greenery/grass.yml +++ b/configuration/skyblock/items/vanilla/blocks/greenery/grass.yml @@ -13,7 +13,7 @@ items: amount: 1 - conditions: drops: - - item: WHEAT_SEEDS + - item: SEEDS chance: 0.125 amount: 1 - id: PLACEABLE @@ -34,7 +34,7 @@ items: amount: 1 - conditions: drops: - - item: WHEAT_SEEDS + - item: SEEDS chance: 0.125 amount: 1 - id: PLACEABLE diff --git a/configuration/skyblock/items/vanilla/items/crops.yml b/configuration/skyblock/items/vanilla/items/crops.yml index 5d00c530e..a1dc2b9e8 100644 --- a/configuration/skyblock/items/vanilla/items/crops.yml +++ b/configuration/skyblock/items/vanilla/items/crops.yml @@ -134,7 +134,7 @@ items: - id: CUSTOM_DISPLAY_NAME display_name: Melon - - id: WHEAT_SEEDS + - id: SEEDS rarity: COMMON components: - id: SELLABLE @@ -152,7 +152,7 @@ items: - item: WHEAT chance: 1.0 amount: 1 - - item: WHEAT_SEEDS + - item: SEEDS chance: 1.0 amount: 1-4 - id: SKILLABLE_MINE 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 124d89dfb..110a4e354 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 @@ -13,7 +13,7 @@ public enum BazaarCategories { FARMING(Material.GOLDEN_HOE, Material.YELLOW_STAINED_GLASS_PANE, "§e", new BazaarItemSet(ItemType.WHEAT, "Wheat & Seeds", - ItemType.WHEAT, ItemType.ENCHANTED_BREAD, ItemType.HAY_BALE, ItemType.ENCHANTED_HAY_BALE, ItemType.WHEAT_SEEDS, ItemType.ENCHANTED_SEEDS), + ItemType.WHEAT, ItemType.ENCHANTED_BREAD, ItemType.HAY_BALE, ItemType.ENCHANTED_HAY_BALE, ItemType.SEEDS, ItemType.ENCHANTED_SEEDS), new BazaarItemSet(ItemType.CARROT, "Carrot", ItemType.CARROT, ItemType.ENCHANTED_CARROT, ItemType.ENCHANTED_GOLDEN_CARROT), new BazaarItemSet(ItemType.POTATO, "Potato", diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUISack.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUISack.java index 2bceb7fbe..1ca5ea084 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUISack.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUISack.java @@ -147,7 +147,6 @@ public ItemStack.Builder getItem(HypixelPlayer p) { ArrayList lore = new ArrayList<>(); Integer amount = player.getSackItems().getAmount(linker); String color = (amount == finalMaxStorage) ? "§a" : "§e"; - lore.add("§8" + StringUtility.toNormalCase(itemTypeLinker.name())); lore.add(""); lore.add("§7Stored: " + color + amount + "§7/" + StringUtility.shortenNumber(StringUtility.roundTo(finalMaxStorage, 0))); lore.add(""); diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/SackComponent.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/SackComponent.java index ec1a4c38b..45a9fa33c 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/SackComponent.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/components/SackComponent.java @@ -2,6 +2,7 @@ import lombok.Getter; import net.swofty.commons.skyblock.item.ItemType; +import net.swofty.type.skyblockgeneric.gui.inventories.sbmenu.bags.GUISack; import net.swofty.type.skyblockgeneric.item.SkyBlockItem; import net.swofty.type.skyblockgeneric.item.SkyBlockItemComponent; import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer; @@ -20,10 +21,10 @@ public SackComponent(List items, int maxCapacity) { .toList(); this.maxCapacity = maxCapacity; addInheritedComponent(new TrackedUniqueComponent()); - addInheritedComponent(new InteractableComponent(this::onInteract, this::onInteract, null)); + addInheritedComponent(new InteractableComponent(this::onInteract, null, null)); } private void onInteract(SkyBlockPlayer player, SkyBlockItem item) { - // TODO + new GUISack(item.getItemType(), false).open(player); } } From 5b30bded51de4c96115bce234c68dffc32e97879 Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sat, 10 Jan 2026 11:11:47 +0100 Subject: [PATCH 2/4] feat: fishing sacks --- .../commons/skyblock/item/ItemType.java | 32 +- .../skyblock/collections/farming.yml | 144 +++++++++ .../skyblock/collections/fishing.yml | 26 +- .../skyblock/items/compactedItems.yml | 21 +- .../skyblock/items/fishing/vanilla.yml | 4 +- configuration/skyblock/items/minions.yml | 36 +-- .../skyblock/items/sacks/agronomySacks.yml | 264 ++++++++++++++++ .../skyblock/items/sacks/fishingSacks.yml | 283 ++++++++++++++++++ .../{sacks.yml => sacks/miningSacks.yml} | 264 ---------------- 9 files changed, 775 insertions(+), 299 deletions(-) create mode 100644 configuration/skyblock/items/sacks/agronomySacks.yml create mode 100644 configuration/skyblock/items/sacks/fishingSacks.yml rename configuration/skyblock/items/{sacks.yml => sacks/miningSacks.yml} (55%) 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 0d6e7f380..f14b7369e 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 @@ -378,6 +378,11 @@ public enum ItemType { LARGE_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC), LARGE_ENCHANTED_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + SMALL_FISHING_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MEDIUM_FISHING_SACK(Material.PLAYER_HEAD, Rarity.RARE), + LARGE_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + LARGE_ENCHANTED_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + /** * Runes */ @@ -557,8 +562,6 @@ public enum ItemType { POLISHED_PUMPKIN(Material.PLAYER_HEAD, Rarity.RARE), BOX_OF_SEEDS(Material.PLAYER_HEAD, Rarity.RARE), ENCHANTED_BOOKSHELF(Material.BOOKSHELF, Rarity.UNCOMMON), - ENCHANTED_COOKED_FISH(Material.COOKED_COD, Rarity.RARE), - ENCHANTED_RAW_FISH(Material.COD, Rarity.RARE), ENCHANTED_IRON_INGOT(Material.IRON_INGOT, Rarity.RARE), TIGHTLY_TIED_HAY_BALE(Material.PLAYER_HEAD, Rarity.RARE), COMPOST(Material.PLAYER_HEAD, Rarity.UNCOMMON), @@ -593,6 +596,20 @@ public enum ItemType { GOLD_MAGMAFISH(Material.PLAYER_HEAD, Rarity.LEGENDARY), DIAMOND_MAGMAFISH(Material.PLAYER_HEAD, Rarity.MYTHIC), FISHING_ROD(Material.FISHING_ROD, Rarity.COMMON), + AGARIMOO_TONGUE(Material.MUTTON, Rarity.UNCOMMON), + ALLIGATOR_SKIN(Material.GREEN_DYE, Rarity.UNCOMMON), + BLUE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BROKEN_RADAR(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BRONZE_BOWL(Material.PLAYER_HEAD, Rarity.UNCOMMON), + BUSTED_BELT_BUCKLE(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CAN_OF_WORMS(Material.PLAYER_HEAD, Rarity.UNCOMMON), + CHUM(Material.PLAYER_HEAD, Rarity.UNCOMMON), + EMPERORS_SKULL(Material.PLAYER_HEAD, Rarity.UNCOMMON), + GLOWING_MUSHROOM(Material.PLAYER_HEAD, Rarity.UNCOMMON), + HALF_EATEN_MUSHROOM(Material.PLAYER_HEAD, Rarity.UNCOMMON), + OLD_LEATHER_BOOT(Material.PLAYER_HEAD, Rarity.UNCOMMON), + RUSTY_COIN(Material.PLAYER_HEAD, Rarity.UNCOMMON), + TORN_CLOTH(Material.PLAYER_HEAD, Rarity.UNCOMMON), /** * Combat Props @@ -1178,8 +1195,8 @@ public enum ItemType { PRISMARINE_CRYSTALS(Material.PRISMARINE_CRYSTALS, Rarity.COMMON), PRISMARINE_SHARD(Material.PRISMARINE_SHARD, Rarity.COMMON), PUFFERFISH(Material.PUFFERFISH, Rarity.COMMON), - COD(Material.COD, Rarity.COMMON), - SALMON(Material.SALMON, Rarity.COMMON), + RAW_FISH(Material.COD, Rarity.COMMON), + RAW_SALMON(Material.SALMON, Rarity.COMMON), TORCH(Material.TORCH, Rarity.COMMON), RAW_BEEF(Material.BEEF, Rarity.UNCOMMON), RAW_CHICKEN(Material.CHICKEN, Rarity.UNCOMMON), @@ -1817,10 +1834,11 @@ public enum ItemType { ENCHANTED_ICE(Material.ICE, Rarity.UNCOMMON), 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_CLAY_BALL(Material.CLAY_BALL, Rarity.UNCOMMON), + ENCHANTED_CLAY_BLOCK(Material.CLAY, Rarity.RARE), ENCHANTED_TROPICAL_FISH(Material.TROPICAL_FISH, Rarity.UNCOMMON), - ENCHANTED_COD(Material.COD, Rarity.UNCOMMON), - ENCHANTED_COOKED_COD(Material.COOKED_COD, Rarity.RARE), + ENCHANTED_RAW_FISH(Material.COD, Rarity.UNCOMMON), + ENCHANTED_COOKED_FISH(Material.COOKED_COD, Rarity.RARE), ENCHANTED_MUTTON(Material.MUTTON, Rarity.UNCOMMON), ENCHANTED_COOKED_MUTTON(Material.COOKED_MUTTON, Rarity.RARE), ENCHANTED_RAW_SALMON(Material.SALMON, Rarity.UNCOMMON), diff --git a/configuration/skyblock/collections/farming.yml b/configuration/skyblock/collections/farming.yml index 0f25a0921..d2e4413ca 100644 --- a/configuration/skyblock/collections/farming.yml +++ b/configuration/skyblock/collections/farming.yml @@ -1128,3 +1128,147 @@ collections: - type: XP data: xp: 4 +- itemType: MOONFLOWER + rewards: + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_MOONFLOWER + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - amount: 10000 + rewards: + - type: XP + data: + xp: 4 + - amount: 25000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: COMPACTED_MOONFLOWER + - amount: 100000 + rewards: + - type: XP + data: + xp: 4 + - amount: 250000 + rewards: + - type: XP + data: + xp: 4 + - amount: 500000 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000000 + rewards: + - type: XP + data: + xp: 4 +- itemType: SUNFLOWER + rewards: + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_SUNFLOWER + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - amount: 10000 + rewards: + - type: XP + data: + xp: 4 + - amount: 25000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: COMPACTED_SUNFLOWER + - amount: 100000 + rewards: + - type: XP + data: + xp: 4 + - amount: 250000 + rewards: + - type: XP + data: + xp: 4 + - amount: 500000 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000000 + rewards: + - type: XP + data: + xp: 4 +- itemType: WILD_ROSE + rewards: + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_WILD_ROSE + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - amount: 10000 + rewards: + - type: XP + data: + xp: 4 + - amount: 25000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: COMPACTED_WILD_ROSE + - amount: 100000 + rewards: + - type: XP + data: + xp: 4 + - amount: 250000 + rewards: + - type: XP + data: + xp: 4 + - amount: 500000 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000000 + rewards: + - type: XP + data: + xp: 4 \ No newline at end of file diff --git a/configuration/skyblock/collections/fishing.yml b/configuration/skyblock/collections/fishing.yml index 26efeceeb..42096e5ad 100644 --- a/configuration/skyblock/collections/fishing.yml +++ b/configuration/skyblock/collections/fishing.yml @@ -18,7 +18,7 @@ collections: xp: 4 - type: RECIPE_UNLOCK data: - unlockedItemType: ENCHANTED_CLAY + unlockedItemType: ENCHANTED_CLAY_BALL - amount: 250 rewards: - type: XP @@ -39,6 +39,14 @@ collections: - type: XP data: xp: 4 + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_CLAY_BLOCK - itemType: TROPICAL_FISH rewards: - amount: 10 @@ -388,6 +396,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SMALL_FISHING_SACK - amount: 800 rewards: - type: XP @@ -398,6 +409,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MEDIUM_FISHING_SACK - amount: 4800 rewards: - type: XP @@ -408,12 +422,18 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_FISHING_SACK - amount: 18000 rewards: - type: XP data: xp: 4 -- itemType: COD + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_ENCHANTED_FISHING_SACK +- itemType: RAW_FISH rewards: - amount: 20 rewards: @@ -494,7 +514,7 @@ collections: - type: CUSTOM_AWARD data: customAward: FISHING_BAG_UPGRADE_4 -- itemType: SALMON +- itemType: RAW_SALMON rewards: - amount: 20 rewards: diff --git a/configuration/skyblock/items/compactedItems.yml b/configuration/skyblock/items/compactedItems.yml index ce3ad9c22..977d37e78 100644 --- a/configuration/skyblock/items/compactedItems.yml +++ b/configuration/skyblock/items/compactedItems.yml @@ -263,7 +263,7 @@ items: - id: SELLABLE value: 320 - - id: ENCHANTED_CLAY + - id: ENCHANTED_CLAY_BALL material: CLAY_BALL rarity: UNCOMMON default_statistics: {} @@ -274,6 +274,17 @@ items: - id: SELLABLE value: 480 + - id: ENCHANTED_CLAY_BLOCK + material: CLAY_BLOCK + rarity: RARE + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FISHING + item_id: ENCHANTED_CLAY_BALL + - id: SELLABLE + value: 76800 + - id: ENCHANTED_TROPICAL_FISH material: TROPICAL_FISH rarity: UNCOMMON @@ -1177,7 +1188,7 @@ items: components: - id: ENCHANTED recipe_type: FISHING - item_id: COD + item_id: RAW_FISH - id: SELLABLE value: 960 @@ -1199,7 +1210,7 @@ items: components: - id: ENCHANTED recipe_type: FISHING - item_id: SALMON + item_id: RAW_SALMON - id: SELLABLE value: 1600 @@ -1666,12 +1677,12 @@ items: - id: SKULL_HEAD texture: c4989d846862952f8ac844abbd4c1f77bf85e924c2bf98236f8d9253624d879f - - id: ENCHANTED_WILD_ROSE + - id: COMPACTED_WILD_ROSE rarity: COMMON components: - id: ENCHANTED recipe_type: FARMING - item_id: ENCHANTED_PUMPKIN + item_id: ENCHANTED_WILD_ROSE - id: SELLABLE value: 256000.0 - id: SKULL_HEAD diff --git a/configuration/skyblock/items/fishing/vanilla.yml b/configuration/skyblock/items/fishing/vanilla.yml index 1c5252be1..4be742c9b 100644 --- a/configuration/skyblock/items/fishing/vanilla.yml +++ b/configuration/skyblock/items/fishing/vanilla.yml @@ -4,7 +4,7 @@ items: components: - id: SELLABLE value: 3.0 - - id: COD + - id: RAW_FISH rarity: COMMON components: - id: SELLABLE @@ -47,7 +47,7 @@ items: effect_duration: 180 effect_amplifier: 0 alchemy_xp: 12 - - id: SALMON + - id: RAW_SALMON rarity: COMMON components: - id: SELLABLE diff --git a/configuration/skyblock/items/minions.yml b/configuration/skyblock/items/minions.yml index fbd8b4edf..ae44d044b 100644 --- a/configuration/skyblock/items/minions.yml +++ b/configuration/skyblock/items/minions.yml @@ -512,13 +512,13 @@ items: - CLAY_BALL:20 - CLAY_BALL:40 - CLAY_BALL:64 - - ENCHANTED_CLAY:1 - - ENCHANTED_CLAY:2 - - ENCHANTED_CLAY:4 - - ENCHANTED_CLAY:8 - - ENCHANTED_CLAY:16 - - ENCHANTED_CLAY:32 - - ENCHANTED_CLAY:64 + - ENCHANTED_CLAY_BALL:1 + - ENCHANTED_CLAY_BALL:2 + - ENCHANTED_CLAY_BALL:4 + - ENCHANTED_CLAY_BALL:8 + - ENCHANTED_CLAY_BALL:16 + - ENCHANTED_CLAY_BALL:32 + - ENCHANTED_CLAY_BALL:64 - id: FISHING_MINION material: PLAYER_HEAD rarity: COMMON @@ -528,17 +528,17 @@ items: base_item: FISHING_ROD default_craftable: false ingredients: - - COD:8 - - COD:16 - - COD:32 - - COD:64 - - ENCHANTED_COD:1 - - ENCHANTED_COD:3 - - ENCHANTED_COD:8 - - ENCHANTED_COD:16 - - ENCHANTED_COD:32 - - ENCHANTED_COD:64 - - ENCHANTED_COOKED_COD:1 + - RAW_FISH:8 + - RAW_FISH:16 + - RAW_FISH:32 + - RAW_FISH:64 + - ENCHANTED_RAW_FISH:1 + - ENCHANTED_RAW_FISH:3 + - ENCHANTED_RAW_FISH:8 + - ENCHANTED_RAW_FISH:16 + - ENCHANTED_RAW_FISH:32 + - ENCHANTED_RAW_FISH:64 + - ENCHANTED_COOKED_FISH:1 - id: ACACIA_MINION material: PLAYER_HEAD rarity: COMMON diff --git a/configuration/skyblock/items/sacks/agronomySacks.yml b/configuration/skyblock/items/sacks/agronomySacks.yml new file mode 100644 index 000000000..638bc3594 --- /dev/null +++ b/configuration/skyblock/items/sacks/agronomySacks.yml @@ -0,0 +1,264 @@ +items: + - id: SMALL_AGRONOMY_SACK + rarity: UNCOMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 2ab879e1e590041146bc78c018af5877d39e5475eb7db368fcaf2acda373833d + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE + max_capacity: 2240 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 16 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_AGRONOMY_SACK + amount: 1 + + - id: MEDIUM_AGRONOMY_SACK + rarity: RARE + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e6,720 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 294c8341a535f80b3f43c5c243d03006bd325c9e96ff3ab957ccc37062830ac6 + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE + max_capacity: 6720 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 32 + B: + type: SMALL_AGRONOMY_SACK + amount: 1 + result: + type: MEDIUM_AGRONOMY_SACK + amount: 1 + + - id: LARGE_AGRONOMY_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' + - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' + - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aSunflower§7, §aWheat§7, §aWild Rose' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: ef835b8941fe319931749b87fe8e84c5d1f4a271b5fbce5e700a60004d881f79 + - id: SACK + valid_items: + - BROWN_MUSHROOM + - CACTUS + - CACTUS_GREEN + - CARROT + - COCOA_BEANS + - GOLDEN_CARROT + - HAY_BALE + - JACK_O_LANTERN + - MELON_SLICE + - MOONFLOWER + - NETHER_WART + - POISONOUS_POTATO + - POTATO + - PUMPKIN + - RED_MUSHROOM + - SEEDS + - SUGAR_CANE + - SUNFLOWER + - WHEAT + - WILD_ROSE + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_WHEAT + amount: 64 + B: + type: MEDIUM_AGRONOMY_SACK + amount: 1 + result: + type: LARGE_AGRONOMY_SACK + amount: 1 + + - id: LARGE_ENCHANTED_AGRONOMY_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§7§aBrown Mushroom§7, §aCactus§7, §aCarrot§7, §aCocoa Beans§7,' + - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPotato§7,' + - '§7§aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' + - '§7§aWheat' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 184d2ff1e177357574f9f71e19397fff3a210a94e78c0d2a4360cc5df1eb807b + - id: SACK + valid_items: + - BOX_OF_SEEDS + - COMPACTED_MOONFLOWER + - COMPACTED_SUNFLOWER + - COMPACTED_WILD_ROSE + - ENCHANTED_BAKED_POTATO + - ENCHANTED_BREAD + - ENCHANTED_BROWN_MUSHROOM + - ENCHANTED_BROWN_MUSHROOM_BLOCK + - ENCHANTED_CACTUS + - ENCHANTED_CACTUS_GREEN + - ENCHANTED_CARROT + - ENCHANTED_COCOA_BEANS + - ENCHANTED_COOKIE + - ENCHANTED_GOLDEN_CARROT + - ENCHANTED_HAY_BALE + - ENCHANTED_MELON_BLOCK + - ENCHANTED_MELON + - ENCHANTED_MOONFLOWER + - ENCHANTED_NETHER_WART + - ENCHANTED_POISONOUS_POTATO + - ENCHANTED_POTATO + - ENCHANTED_PUMPKIN + - ENCHANTED_RED_MUSHROOM + - ENCHANTED_RED_MUSHROOM_BLOCK + - ENCHANTED_SEEDS + - ENCHANTED_SUGAR + - ENCHANTED_SUGAR_CANE + - ENCHANTED_SUNFLOWER + - ENCHANTED_WHEAT + - ENCHANTED_WILD_ROSE + - MUTANT_NETHER_WART + - POLISHED_PUMPKIN + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_HAY_BALE + amount: 3 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_AGRONOMY_SACK + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/sacks/fishingSacks.yml b/configuration/skyblock/items/sacks/fishingSacks.yml new file mode 100644 index 000000000..e0615a2e8 --- /dev/null +++ b/configuration/skyblock/items/sacks/fishingSacks.yml @@ -0,0 +1,283 @@ +items: + - id: SMALL_FISHING_SACK + rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAgarimoo Tongue§7, §aAlligator Skin§7, §aBlue Ring§7, §aBlue' + - '§aShark Tooth§7, §aBroken Radar§7, §aBronze Bowl§7, §aBusted Belt' + - "§aBuckle§7, §aCan of Worms§7, §aChum§7, §aClay Ball§7, §aEmperor's Skull§7," + - '§aGlowing Mushroom§7, §aHalf-Eaten Mushroom§7, §aInk Sac§7, §aLily' + - '§aPad§7, §aNurse Shark Tooth§7, §aOld Leather Boot§7, §aPrismarine' + - '§aCrystals§7, §aPrismarine Shard§7, §aPufferfish§7, §aRaw Cod§7, §aRaw' + - '§aSalmon§7, §aRusty Coin§7, §aShark Fin§7, §aSponge§7, §aTiger Shark' + - '§aTooth§7, §aTorn Cloth§7, §aTropical Fish§7, §aWorm Membrane' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: c4fbc77d27dab10de5abf9d0bcc47198f923b0e6c179a3c3983e77f12f7c033e + - id: SACK + valid_items: + - AGARIMOO_TONGUE + - ALLIGATOR_SKIN + - BLUE_RING + - BLUE_SHARK_TOOTH + - BROKEN_RADAR + - BRONZE_BOWL + - BUSTED_BELT_BUCKLE + - CAN_OF_WORMS + - CHUM + - CLAY_BALL + - EMPERORS_SKULL + - GLOWING_MUSHROOM + - HALF_EATEN_MUSHROOM + - INK_SAC + - LILY_PAD + - NURSE_SHARK_TOOTH + - OLD_LEATHER_BOOT + - PRISMARINE_CRYSTALS + - PRISMARINE_SHARD + - PUFFERFISH + - RAW_FISH + - RAW_SALMON + - RUSTY_COIN + - SHARK_FIN + - SPONGE + - TIGER_SHARK_TOOTH + - TORN_CLOTH + - TROPICAL_FISH + - WORM_MEMBRANE + max_capacity: 2240 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_PUFFERFISH + amount: 2 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_FISHING_SACK + amount: 1 + + - id: MEDIUM_FISHING_SACK + rarity: RARE + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAgarimoo Tongue§7, §aAlligator Skin§7, §aBlue Ring§7, §aBlue' + - '§aShark Tooth§7, §aBroken Radar§7, §aBronze Bowl§7, §aBusted Belt' + - "§aBuckle§7, §aCan of Worms§7, §aChum§7, §aClay Ball§7, §aEmperor's Skull§7," + - '§aGlowing Mushroom§7, §aHalf-Eaten Mushroom§7, §aInk Sac§7, §aLily' + - '§aPad§7, §aNurse Shark Tooth§7, §aOld Leather Boot§7, §aPrismarine' + - '§aCrystals§7, §aPrismarine Shard§7, §aPufferfish§7, §aRaw Cod§7, §aRaw' + - '§aSalmon§7, §aRusty Coin§7, §aShark Fin§7, §aSponge§7, §aTiger Shark' + - '§aTooth§7, §aTorn Cloth§7, §aTropical Fish§7, §aWorm Membrane' + - '' + - '§7Capacity: §e6,720 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: ff75871c90b94f4fbc167e351d36e8aeae1cc2fec03b16629007f74c989de648 + - id: SACK + valid_items: + - AGARIMOO_TONGUE + - ALLIGATOR_SKIN + - BLUE_RING + - BLUE_SHARK_TOOTH + - BROKEN_RADAR + - BRONZE_BOWL + - BUSTED_BELT_BUCKLE + - CAN_OF_WORMS + - CHUM + - CLAY_BALL + - EMPERORS_SKULL + - GLOWING_MUSHROOM + - HALF_EATEN_MUSHROOM + - INK_SAC + - LILY_PAD + - NURSE_SHARK_TOOTH + - OLD_LEATHER_BOOT + - PRISMARINE_CRYSTALS + - PRISMARINE_SHARD + - PUFFERFISH + - RAW_FISH + - RAW_SALMON + - RUSTY_COIN + - SHARK_FIN + - SPONGE + - TIGER_SHARK_TOOTH + - TORN_CLOTH + - TROPICAL_FISH + - WORM_MEMBRANE + max_capacity: 6720 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_PUFFERFISH + amount: 4 + B: + type: SMALL_FISHING_SACK + amount: 1 + result: + type: MEDIUM_FISHING_SACK + amount: 1 + + - id: LARGE_FISHING_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAgarimoo Tongue§7, §aAlligator Skin§7, §aBlue Ring§7, §aBlue' + - '§aShark Tooth§7, §aBroken Radar§7, §aBronze Bowl§7, §aBusted Belt' + - "§aBuckle§7, §aCan of Worms§7, §aChum§7, §aClay Ball§7, §aEmperor's Skull§7," + - '§aGlowing Mushroom§7, §aHalf-Eaten Mushroom§7, §aInk Sac§7, §aLily' + - '§aPad§7, §aNurse Shark Tooth§7, §aOld Leather Boot§7, §aPrismarine' + - '§aCrystals§7, §aPrismarine Shard§7, §aPufferfish§7, §aRaw Cod§7, §aRaw' + - '§aSalmon§7, §aRusty Coin§7, §aShark Fin§7, §aSponge§7, §aTiger Shark' + - '§aTooth§7, §aTorn Cloth§7, §aTropical Fish§7, §aWorm Membrane' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: f8f68669351a6fc7156ecfe3300ba94efe0766e24bed8785cf64a9f95435134b + - id: SACK + valid_items: + - AGARIMOO_TONGUE + - ALLIGATOR_SKIN + - BLUE_RING + - BLUE_SHARK_TOOTH + - BROKEN_RADAR + - BRONZE_BOWL + - BUSTED_BELT_BUCKLE + - CAN_OF_WORMS + - CHUM + - CLAY_BALL + - EMPERORS_SKULL + - GLOWING_MUSHROOM + - HALF_EATEN_MUSHROOM + - INK_SAC + - LILY_PAD + - NURSE_SHARK_TOOTH + - OLD_LEATHER_BOOT + - PRISMARINE_CRYSTALS + - PRISMARINE_SHARD + - PUFFERFISH + - RAW_FISH + - RAW_SALMON + - RUSTY_COIN + - SHARK_FIN + - SPONGE + - TIGER_SHARK_TOOTH + - TORN_CLOTH + - TROPICAL_FISH + - WORM_MEMBRANE + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_PUFFERFISH + amount: 8 + B: + type: MEDIUM_FISHING_SACK + amount: 1 + result: + type: LARGE_FISHING_SACK + amount: 1 + + - id: LARGE_ENCHANTED_FISHING_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§aClay Ball§7, §aCooked Fish§7, §aCooked Salmon§7, §aInk Sac§7,' + - '§aLily Pad§7, §aPrismarine Crystals§7, §aPrismarine' + - '§aShard§7, §aPufferfish§7, §aRaw Cod§7, §aRaw Salmon§7, §aShark' + - '§aFin§7, §aSponge§7, §aTropical Fish§7, §aWet Sponge' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: ee2469de7f75d2e0a8b3b0c734a2b470782b604d1feb0172b4a72a77cb5bbda2 + - id: SACK + valid_items: + - ENCHANTED_CLAY_BALL + - ENCHANTED_CLAY_BLOCK + - ENCHANTED_COOKED_FISH + - ENCHANTED_COOKED_SALMON + - ENCHANTED_INK_SAC + - ENCHANTED_LILY_PAD + - ENCHANTED_PRISMARINE_CRYSTALS + - ENCHANTED_PRISMARINE_SHARD + - ENCHANTED_PUFFERFISH + - ENCHANTED_RAW_FISH + - ENCHANTED_RAW_SALMON + - ENCHANTED_SHARK_FIN + - ENCHANTED_SPONGE + - ENCHANTED_TROPICAL_FISH + - ENCHANTED_WET_SPONGE + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_PUFFERFISH + amount: 16 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_FISHING_SACK + amount: 1 \ No newline at end of file diff --git a/configuration/skyblock/items/sacks.yml b/configuration/skyblock/items/sacks/miningSacks.yml similarity index 55% rename from configuration/skyblock/items/sacks.yml rename to configuration/skyblock/items/sacks/miningSacks.yml index 29d080693..e90d997a1 100644 --- a/configuration/skyblock/items/sacks.yml +++ b/configuration/skyblock/items/sacks/miningSacks.yml @@ -325,268 +325,4 @@ items: amount: 12 result: type: LARGE_ENCHANTED_MINING_SACK - amount: 1 - - - id: SMALL_AGRONOMY_SACK - rarity: UNCOMMON - lore: - - '§7Item pickups go directly into your' - - '§7sacks.' - - '' - - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' - - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," - - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' - - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' - - '§7§aSunflower§7, §aWheat§7, §aWild Rose' - - '' - - '§7Capacity: §e2,240 per item' - - '§8Sacks sum their capacity.' - - '' - - '§eRight Click to open sack!' - components: - - id: SKULL_HEAD - texture: 2ab879e1e590041146bc78c018af5877d39e5475eb7db368fcaf2acda373833d - - id: SACK - valid_items: - - BROWN_MUSHROOM - - CACTUS - - CACTUS_GREEN - - CARROT - - COCOA_BEANS - - GOLDEN_CARROT - - HAY_BALE - - JACK_O_LANTERN - - MELON_SLICE - - MOONFLOWER - - NETHER_WART - - POISONOUS_POTATO - - POTATO - - PUMPKIN - - RED_MUSHROOM - - SEEDS - - SUGAR_CANE - - SUNFLOWER - - WHEAT - - WILD_ROSE - max_capacity: 2240 - - id: DEFAULT_CRAFTABLE - default-craftable: false - recipes: - - type: SHAPED - recipe-type: MINING - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_WHEAT - amount: 16 - B: - type: ENCHANTED_LEATHER - amount: 1 - result: - type: SMALL_AGRONOMY_SACK - amount: 1 - - - id: MEDIUM_AGRONOMY_SACK - rarity: RARE - lore: - - '§7Item pickups go directly into your' - - '§7sacks.' - - '' - - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' - - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," - - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' - - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' - - '§7§aSunflower§7, §aWheat§7, §aWild Rose' - - '' - - '§7Capacity: §e6,720 per item' - - '§8Sacks sum their capacity.' - - '' - - '§eRight Click to open sack!' - components: - - id: SKULL_HEAD - texture: 294c8341a535f80b3f43c5c243d03006bd325c9e96ff3ab957ccc37062830ac6 - - id: SACK - valid_items: - - BROWN_MUSHROOM - - CACTUS - - CACTUS_GREEN - - CARROT - - COCOA_BEANS - - GOLDEN_CARROT - - HAY_BALE - - JACK_O_LANTERN - - MELON_SLICE - - MOONFLOWER - - NETHER_WART - - POISONOUS_POTATO - - POTATO - - PUMPKIN - - RED_MUSHROOM - - SEEDS - - SUGAR_CANE - - SUNFLOWER - - WHEAT - - WILD_ROSE - max_capacity: 6720 - - id: DEFAULT_CRAFTABLE - default-craftable: false - recipes: - - type: SHAPED - recipe-type: MINING - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_WHEAT - amount: 32 - B: - type: SMALL_AGRONOMY_SACK - amount: 1 - result: - type: MEDIUM_AGRONOMY_SACK - amount: 1 - - - id: LARGE_AGRONOMY_SACK - rarity: EPIC - lore: - - '§7Item pickups go directly into your' - - '§7sacks.' - - '' - - '§7§7Items: §aBrown Mushroom§7, §aCactus§7, §aCactus Green§7, §aCarrot§7,' - - "§7§aCocoa Beans§7, §aGolden Carrot§7, §aHay Bale§7, §aJack o' Lantern§7," - - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPoisonous Potato§7,' - - '§7§aPotato§7, §aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' - - '§7§aSunflower§7, §aWheat§7, §aWild Rose' - - '' - - '§7Capacity: §e20,160 per item' - - '§8Sacks sum their capacity.' - - '' - - '§eRight Click to open sack!' - components: - - id: SKULL_HEAD - texture: ef835b8941fe319931749b87fe8e84c5d1f4a271b5fbce5e700a60004d881f79 - - id: SACK - valid_items: - - BROWN_MUSHROOM - - CACTUS - - CACTUS_GREEN - - CARROT - - COCOA_BEANS - - GOLDEN_CARROT - - HAY_BALE - - JACK_O_LANTERN - - MELON_SLICE - - MOONFLOWER - - NETHER_WART - - POISONOUS_POTATO - - POTATO - - PUMPKIN - - RED_MUSHROOM - - SEEDS - - SUGAR_CANE - - SUNFLOWER - - WHEAT - - WILD_ROSE - max_capacity: 20160 - - id: DEFAULT_CRAFTABLE - default-craftable: false - recipes: - - type: SHAPED - recipe-type: MINING - pattern: - - AAA - - ABA - - AAA - ingredients: - A: - type: ENCHANTED_WHEAT - amount: 64 - B: - type: MEDIUM_AGRONOMY_SACK - amount: 1 - result: - type: LARGE_AGRONOMY_SACK - amount: 1 - - - id: LARGE_ENCHANTED_AGRONOMY_SACK - rarity: EPIC - lore: - - '§7Item pickups go directly into your' - - '§7sacks.' - - '' - - '§7This sack can contain all enchanted versions' - - '§7of these materials:' - - '§7§aBrown Mushroom§7, §aCactus§7, §aCarrot§7, §aCocoa Beans§7,' - - '§7§aMelon Slice§7, §aMoonflower§7, §aNether Wart§7, §aPotato§7,' - - '§7§aPumpkin§7, §aRed Mushroom§7, §aSeeds§7, §aSugar Cane§7,' - - '§7§aWheat' - - '' - - '§7Capacity: §e20,160 per item' - - '§8Sacks sum their capacity.' - - '' - - '§eRight Click to open sack!' - components: - - id: SKULL_HEAD - texture: 184d2ff1e177357574f9f71e19397fff3a210a94e78c0d2a4360cc5df1eb807b - - id: SACK - valid_items: - - BOX_OF_SEEDS - - COMPACTED_MOONFLOWER - - COMPACTED_SUNFLOWER - - COMPACTED_WILD_ROSE - - ENCHANTED_BAKED_POTATO - - ENCHANTED_BREAD - - ENCHANTED_BROWN_MUSHROOM - - ENCHANTED_BROWN_MUSHROOM_BLOCK - - ENCHANTED_CACTUS - - ENCHANTED_CACTUS_GREEN - - ENCHANTED_CARROT - - ENCHANTED_COCOA_BEANS - - ENCHANTED_COOKIE - - ENCHANTED_GOLDEN_CARROT - - ENCHANTED_HAY_BALE - - ENCHANTED_MELON_BLOCK - - ENCHANTED_MELON - - ENCHANTED_MOONFLOWER - - ENCHANTED_NETHER_WART - - ENCHANTED_POISONOUS_POTATO - - ENCHANTED_POTATO - - ENCHANTED_PUMPKIN - - ENCHANTED_RED_MUSHROOM - - ENCHANTED_RED_MUSHROOM_BLOCK - - ENCHANTED_SEEDS - - ENCHANTED_SUGAR - - ENCHANTED_SUGAR_CANE - - ENCHANTED_SUNFLOWER - - ENCHANTED_WHEAT - - ENCHANTED_WILD_ROSE - - MUTANT_NETHER_WART - - POLISHED_PUMPKIN - max_capacity: 20160 - - id: DEFAULT_CRAFTABLE - default-craftable: false - recipes: - - type: SHAPED - recipe-type: MINING - pattern: - - ABA - - ACA - - AAA - ingredients: - A: - type: ENCHANTED_HAY_BALE - amount: 3 - B: - type: ENCHANTED_STRING - amount: 16 - C: - type: ENCHANTED_LEATHER - amount: 12 - result: - type: LARGE_ENCHANTED_AGRONOMY_SACK amount: 1 \ No newline at end of file From 07463f6e848c4391cbe8f1e44bcc6a632ca37565 Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sat, 10 Jan 2026 13:27:42 +0100 Subject: [PATCH 3/4] feat: foraging sacks --- .../commons/skyblock/item/ItemType.java | 25 ++ .../skyblock/collections/foraging.yml | 294 +++++++++++++++++- .../skyblock/items/compactedItems.yml | 59 +++- .../skyblock/items/sacks/foragingSacks.yml | 274 ++++++++++++++++ 4 files changed, 646 insertions(+), 6 deletions(-) create mode 100644 configuration/skyblock/items/sacks/foragingSacks.yml 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 f14b7369e..8f1ee20ab 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 @@ -383,6 +383,11 @@ public enum ItemType { LARGE_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), LARGE_ENCHANTED_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + SMALL_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MEDIUM_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.RARE), + LARGE_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + LARGE_ENCHANTED_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + /** * Runes */ @@ -582,6 +587,21 @@ public enum ItemType { PROMISING_AXE(Material.IRON_AXE, Rarity.UNCOMMON), SWEET_AXE(Material.IRON_AXE, Rarity.UNCOMMON), EFFICIENT_AXE(Material.IRON_AXE, Rarity.UNCOMMON), + BAMBOO(Material.BAMBOO, Rarity.COMMON), + DEEP_ROOT(Material.PLAYER_HEAD, Rarity.COMMON), + FIG_LOG(Material.STRIPPED_SPRUCE_LOG, Rarity.COMMON), + FLEXBONE(Material.BONE, Rarity.COMMON), + GILL_MEMBRANE(Material.PLAYER_HEAD, Rarity.COMMON), + LUSHLILAC(Material.PLAYER_HEAD, Rarity.COMMON), + SEA_LUMIES(Material.SEA_PICKLE, Rarity.COMMON), + STARLYN_PRIZE(Material.PLAYER_HEAD, Rarity.COMMON), + STRETCHING_STICKS(Material.STICK, Rarity.COMMON), + STURDY_BONE(Material.PLAYER_HEAD, Rarity.COMMON), + TENDER_WOOD(Material.PLAYER_HEAD, Rarity.COMMON), + VINESAP(Material.PLAYER_HEAD, Rarity.COMMON), + WET_WATER(Material.PLAYER_HEAD, Rarity.COMMON), + FIGSTONE(Material.PLAYER_HEAD, Rarity.COMMON), + MANGCORE(Material.PLAYER_HEAD, Rarity.COMMON), /** * Fishing Props @@ -1907,6 +1927,11 @@ public enum ItemType { COMPACTED_MOONFLOWER(Material.BLUE_ORCHID, Rarity.RARE), COMPACTED_SUNFLOWER(Material.SUNFLOWER, Rarity.RARE), COMPACTED_WILD_ROSE(Material.ROSE_BUSH, Rarity.RARE), + ENCHANTED_FIG_LOG(Material.STRIPPED_SPRUCE_LOG, Rarity.UNCOMMON), + ENCHANTED_MANGROVE_LOG(Material.MANGROVE_LOG, Rarity.UNCOMMON), + ENCHANTED_SEA_LUMIES(Material.SEA_PICKLE, Rarity.UNCOMMON), + ENCHANTED_TENDER_WOOD(Material.PLAYER_HEAD, Rarity.UNCOMMON), + ENCHANTED_VINESAP(Material.PLAYER_HEAD, Rarity.UNCOMMON), ; public final Material material; diff --git a/configuration/skyblock/collections/foraging.yml b/configuration/skyblock/collections/foraging.yml index 16f089f22..ff4eb993f 100644 --- a/configuration/skyblock/collections/foraging.yml +++ b/configuration/skyblock/collections/foraging.yml @@ -139,6 +139,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_BIRCH_LOG - amount: 500 rewards: - type: XP @@ -156,27 +159,31 @@ collections: xp: 4 - type: RECIPE_UNLOCK data: - unlockedItemType: ENCHANTED_BIRCH_LOG + unlockedItemType: SMALL_FORAGING_SACK - amount: 5000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MEDIUM_FORAGING_SACK - amount: 10000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_FORAGING_SACK - amount: 25000 rewards: - type: XP data: xp: 4 - - amount: 50000 - rewards: - - type: XP + - type: RECIPE_UNLOCK data: - xp: 4 + unlockedItemType: LARGE_ENCHANTED_FORAGING_SACK - itemType: JUNGLE_LOG rewards: - amount: 50 @@ -339,3 +346,280 @@ collections: - type: XP data: xp: 4 +- itemType: FIG_LOG + rewards: + - amount: 500 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_FIG_LOG + - amount: 2500 + rewards: + - type: XP + data: + xp: 4 + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - amount: 10000 + rewards: + - type: XP + data: + xp: 4 + - amount: 25000 + rewards: + - type: XP + data: + xp: 4 + - amount: 50000 + rewards: + - type: XP + data: + xp: 4 + - amount: 100000 + rewards: + - type: XP + data: + xp: 4 + - amount: 150000 + rewards: + - type: XP + data: + xp: 4 +- itemType: TENDER_WOOD + rewards: + - amount: 10 + rewards: + - type: XP + data: + xp: 4 + - amount: 25 + rewards: + - type: XP + data: + xp: 4 + - amount: 50 + rewards: + - type: XP + data: + xp: 4 + - amount: 100 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_TENDER_WOOD + - amount: 200 + rewards: + - type: XP + data: + xp: 4 + - amount: 400 + rewards: + - type: XP + data: + xp: 4 + - amount: 600 + rewards: + - type: XP + data: + xp: 4 + - amount: 800 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 +- itemType: MANGROVE_LOG + rewards: + - amount: 500 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_MANGROVE_LOG + - amount: 2500 + rewards: + - type: XP + data: + xp: 4 + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 + - amount: 10000 + rewards: + - type: XP + data: + xp: 4 + - amount: 25000 + rewards: + - type: XP + data: + xp: 4 + - amount: 50000 + rewards: + - type: XP + data: + xp: 4 + - amount: 100000 + rewards: + - type: XP + data: + xp: 4 + - amount: 150000 + rewards: + - type: XP + data: + xp: 4 +- itemType: VINESAP + rewards: + - amount: 10 + rewards: + - type: XP + data: + xp: 4 + - amount: 25 + rewards: + - type: XP + data: + xp: 4 + - amount: 50 + rewards: + - type: XP + data: + xp: 4 + - amount: 100 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_VINESAP + - amount: 200 + rewards: + - type: XP + data: + xp: 4 + - amount: 400 + rewards: + - type: XP + data: + xp: 4 + - amount: 600 + rewards: + - type: XP + data: + xp: 4 + - amount: 800 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 +- itemType: LUSHLILAC + rewards: + - amount: 25 + rewards: + - type: XP + data: + xp: 4 + - amount: 50 + rewards: + - type: XP + data: + xp: 4 + - amount: 100 + rewards: + - type: XP + data: + xp: 4 + - amount: 250 + rewards: + - type: XP + data: + xp: 4 + - amount: 500 + rewards: + - type: XP + data: + xp: 4 +- itemType: SEA_LUMIES + rewards: + - amount: 25 + rewards: + - type: XP + data: + xp: 4 + - amount: 50 + rewards: + - type: XP + data: + xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: ENCHANTED_SEA_LUMIES + - amount: 100 + rewards: + - type: XP + data: + xp: 4 + - amount: 250 + rewards: + - type: XP + data: + xp: 4 + - amount: 500 + rewards: + - type: XP + data: + xp: 4 + - amount: 750 + rewards: + - type: XP + data: + xp: 4 + - amount: 1000 + rewards: + - type: XP + data: + xp: 4 + - amount: 2500 + rewards: + - type: XP + data: + xp: 4 + - amount: 5000 + rewards: + - type: XP + data: + xp: 4 \ No newline at end of file diff --git a/configuration/skyblock/items/compactedItems.yml b/configuration/skyblock/items/compactedItems.yml index 977d37e78..7fa9fd72c 100644 --- a/configuration/skyblock/items/compactedItems.yml +++ b/configuration/skyblock/items/compactedItems.yml @@ -1686,4 +1686,61 @@ items: - id: SELLABLE value: 256000.0 - id: SKULL_HEAD - texture: a33051b7c69f51085cc43f0575139cd58afe2b83f33d2a203a5afc266c21019 \ No newline at end of file + texture: a33051b7c69f51085cc43f0575139cd58afe2b83f33d2a203a5afc266c21019 + + - id: ENCHANTED_FIG_LOG + material: STRIPPED_SPRUCE_LOG + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FORAGING + item_id: FIG_LOG + - id: SELLABLE + value: 576 + + - id: ENCHANTED_MANGROVE_LOG + material: MANGROVE_LOG + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FORAGING + item_id: MANGROVE_LOG + - id: SELLABLE + value: 576 + + - id: ENCHANTED_SEA_LUMIES + material: SEA_PICKLE + rarity: UNCOMMON + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FORAGING + item_id: SEA_LUMIES + - id: SELLABLE + value: 576 + + - id: ENCHANTED_TENDER_WOOD + rarity: RARE + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FORAGING + item_id: TENDER_WOOD + - id: SELLABLE + value: 576 + - id: SKULL_HEAD + texture: 455affb78f594ca7b6ec39216151304ce1bf18b788cce13b14f345d808a44126 + + - id: ENCHANTED_VINESAP + rarity: RARE + default_statistics: {} + components: + - id: ENCHANTED + recipe_type: FORAGING + item_id: VINESAP + - id: SELLABLE + value: 576 + - id: SKULL_HEAD + texture: 3be8db48a63f09bb85044d9dbd325cfc3881c00912e9edc33bf22fda320bea66 \ No newline at end of file diff --git a/configuration/skyblock/items/sacks/foragingSacks.yml b/configuration/skyblock/items/sacks/foragingSacks.yml new file mode 100644 index 000000000..95be5a556 --- /dev/null +++ b/configuration/skyblock/items/sacks/foragingSacks.yml @@ -0,0 +1,274 @@ +items: + - id: SMALL_FORAGING_SACK + rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAcacia Log§7, §aAcacia Sapling§7, §aApple§7, §aBamboo§7, §aBirch' + - '§aLog§7, §aBirch Sapling§7, §aDark Oak Log§7, §aDark Oak Sapling§7, §aDeep' + - '§aRoot§7, §aFig Log§7, §aFlexbone§7, §aGill Membrane§7, §aJungle Log§7,' + - '§aJungle Sapling§7, §aLushlilac§7, §aMangrove Log§7, §aOak Log§7, §aOak' + - '§aSapling§7, §aSea Lumies§7, §aSpruce Log§7, §aSpruce Sapling§7, §aStarlyn' + - '§aPrize§7, §aStick§7, §aStretching Sticks§7, §aSturdy Bone§7, §aTender' + - '§aWood§7, §aVinesap§7, §aWet Water' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 4f960c639d4004d1882575aeba69f456fb3c744077935714947e19c1306d2733 + - id: SACK + valid_items: + - ACACIA_LOG + - ACACIA_SAPLING + - APPLE + - BAMBOO + - BIRCH_LOG + - BIRCH_SAPLING + - DARK_OAK_LOG + - DARK_OAK_SAPLING + - DEEP_ROOT + - FIG_LOG + - FLEXBONE + - GILL_MEMBRANE + - JUNGLE_LOG + - JUNGLE_SAPLING + - LUSHLILAC + - MANGROVE_LOG + - OAK_LOG + - OAK_SAPLING + - SEA_LUMIES + - SPRUCE_LOG + - SPRUCE_SAPLING + - STARLYN_PRIZE + - STICK + - STRETCHING_STICKS + - STURDY_BONE + - TENDER_WOOD + - VINESAP + - WET_WATER + max_capacity: 2240 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_BIRCH_LOG + amount: 2 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_FORAGING_SACK + amount: 1 + + - id: MEDIUM_FORAGING_SACK + rarity: RARE + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAcacia Log§7, §aAcacia Sapling§7, §aApple§7, §aBamboo§7, §aBirch' + - '§aLog§7, §aBirch Sapling§7, §aDark Oak Log§7, §aDark Oak Sapling§7, §aDeep' + - '§aRoot§7, §aFig Log§7, §aFlexbone§7, §aGill Membrane§7, §aJungle Log§7,' + - '§aJungle Sapling§7, §aLushlilac§7, §aMangrove Log§7, §aOak Log§7, §aOak' + - '§aSapling§7, §aSea Lumies§7, §aSpruce Log§7, §aSpruce Sapling§7, §aStarlyn' + - '§aPrize§7, §aStick§7, §aStretching Sticks§7, §aSturdy Bone§7, §aTender' + - '§aWood§7, §aVinesap§7, §aWet Water' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 2c14105c7b629cfdeb866a560bab59734aa5cbbe880ed9f50f9044c42afd599d + - id: SACK + valid_items: + - ACACIA_LOG + - ACACIA_SAPLING + - APPLE + - BAMBOO + - BIRCH_LOG + - BIRCH_SAPLING + - DARK_OAK_LOG + - DARK_OAK_SAPLING + - DEEP_ROOT + - FIG_LOG + - FLEXBONE + - GILL_MEMBRANE + - JUNGLE_LOG + - JUNGLE_SAPLING + - LUSHLILAC + - MANGROVE_LOG + - OAK_LOG + - OAK_SAPLING + - SEA_LUMIES + - SPRUCE_LOG + - SPRUCE_SAPLING + - STARLYN_PRIZE + - STICK + - STRETCHING_STICKS + - STURDY_BONE + - TENDER_WOOD + - VINESAP + - WET_WATER + max_capacity: 6720 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_BIRCH_LOG + amount: 4 + B: + type: SMALL_FORAGING_SACK + amount: 1 + result: + type: MEDIUM_FORAGING_SACK + amount: 1 + + - id: LARGE_FORAGING_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aAcacia Log§7, §aAcacia Sapling§7, §aApple§7, §aBamboo§7, §aBirch' + - '§aLog§7, §aBirch Sapling§7, §aDark Oak Log§7, §aDark Oak Sapling§7, §aDeep' + - '§aRoot§7, §aFig Log§7, §aFlexbone§7, §aGill Membrane§7, §aJungle Log§7,' + - '§aJungle Sapling§7, §aLushlilac§7, §aMangrove Log§7, §aOak Log§7, §aOak' + - '§aSapling§7, §aSea Lumies§7, §aSpruce Log§7, §aSpruce Sapling§7, §aStarlyn' + - '§aPrize§7, §aStick§7, §aStretching Sticks§7, §aSturdy Bone§7, §aTender' + - '§aWood§7, §aVinesap§7, §aWet Water' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 2c6e24df498ba4a589c259d9fc0d3db348f93cdf26a5fe461571c1da706efaf3 + - id: SACK + valid_items: + - ACACIA_LOG + - ACACIA_SAPLING + - APPLE + - BAMBOO + - BIRCH_LOG + - BIRCH_SAPLING + - DARK_OAK_LOG + - DARK_OAK_SAPLING + - DEEP_ROOT + - FIG_LOG + - FLEXBONE + - GILL_MEMBRANE + - JUNGLE_LOG + - JUNGLE_SAPLING + - LUSHLILAC + - MANGROVE_LOG + - OAK_LOG + - OAK_SAPLING + - SEA_LUMIES + - SPRUCE_LOG + - SPRUCE_SAPLING + - STARLYN_PRIZE + - STICK + - STRETCHING_STICKS + - STURDY_BONE + - TENDER_WOOD + - VINESAP + - WET_WATER + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_BIRCH_LOG + amount: 8 + B: + type: MEDIUM_FORAGING_SACK + amount: 1 + result: + type: LARGE_FORAGING_SACK + amount: 1 + + - id: LARGE_ENCHANTED_FORAGING_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§aAcacia Log§7, §aBirch Log§7, §aDark Oak Log§7, §aFig Log§7,' + - '§aFigstone§7, §aJungle Log§7, §aMangcore§7, §aMangrove Log§7,' + - '§aOak Log§7, §aSpruce Log' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 35326464c6a79362730d79fe4611b911353c1b3c5144177773591357f1cd5ca1 + - id: SACK + valid_items: + - ENCHANTED_ACACIA_LOG + - ENCHANTED_BIRCH_LOG + - ENCHANTED_DARK_OAK_LOG + - ENCHANTED_FIG_LOG + - ENCHANTED_JUNGLE_LOG + - ENCHANTED_MANGROVE_LOG + - ENCHANTED_OAK_LOG + - ENCHANTED_SPRUCE_LOG + - ENCHANTED_SEA_LUMIES + - ENCHANTED_TENDER_WOOD + - ENCHANTED_VINESAP + - FIGSTONE + - MANGCORE + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_BIRCH_LOG + amount: 16 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_FORAGING_SACK + amount: 1 \ No newline at end of file From 554742a51e099c0517632a181c935a4d5f17dbda Mon Sep 17 00:00:00 2001 From: ItzKatze <136186750+ItzKatze@users.noreply.github.com> Date: Sat, 10 Jan 2026 20:50:35 +0100 Subject: [PATCH 4/4] feat: combat sacks --- .../commons/skyblock/item/ItemType.java | 5 + configuration/skyblock/collections/combat.yml | 12 + .../skyblock/items/sacks/combatSacks.yml | 216 ++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 configuration/skyblock/items/sacks/combatSacks.yml 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 8f1ee20ab..1a76b572c 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 @@ -388,6 +388,11 @@ public enum ItemType { LARGE_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), LARGE_ENCHANTED_FORAGING_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + SMALL_COMBAT_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON), + MEDIUM_COMBAT_SACK(Material.PLAYER_HEAD, Rarity.RARE), + LARGE_COMBAT_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + LARGE_ENCHANTED_COMBAT_SACK(Material.PLAYER_HEAD, Rarity.EPIC), + /** * Runes */ diff --git a/configuration/skyblock/collections/combat.yml b/configuration/skyblock/collections/combat.yml index 762baad8b..ab41b20bc 100644 --- a/configuration/skyblock/collections/combat.yml +++ b/configuration/skyblock/collections/combat.yml @@ -491,6 +491,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: SMALL_COMBAT_SACK - amount: 5000 rewards: - type: XP @@ -504,6 +507,9 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: MEDIUM_COMBAT_SACK - amount: 25000 rewards: - type: XP @@ -514,11 +520,17 @@ collections: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_COMBAT_SACK - amount: 100000 rewards: - type: XP data: xp: 4 + - type: RECIPE_UNLOCK + data: + unlockedItemType: LARGE_ENCHANTED_COMBAT_SACK - itemType: SLIME_BALL rewards: - amount: 50 diff --git a/configuration/skyblock/items/sacks/combatSacks.yml b/configuration/skyblock/items/sacks/combatSacks.yml new file mode 100644 index 000000000..434a92e4f --- /dev/null +++ b/configuration/skyblock/items/sacks/combatSacks.yml @@ -0,0 +1,216 @@ +items: + - id: SMALL_COMBAT_SACK + rarity: COMMON + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aBlaze Rod§7, §aBone§7, §aChili Pepper§7, §aEnder Pearl§7, §aGhast' + - '§aTear§7, §aGunpowder§7, §aMagma Cream§7, §aRotten Flesh§7, §aSlimeball§7,' + - '§aSpider Eye§7, §aString' + - '' + - '§7Capacity: §e2,240 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 9b8f452c9d6b6254b5478569a60b0b6fb031c7ad2f06ea3dacf2ce874ca7083 + - id: SACK + valid_items: + - BLAZE_ROD + - BONE + - CHILI_PEPPER + - ENDER_PEARL + - GHAST_TEAR + - GUNPOWDER + - MAGMA_CREAM + - ROTTEN_FLESH + - SLIME_BALL + - SPIDER_EYE + - STRING + max_capacity: 2240 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_ROTTEN_FLESH + amount: 2 + B: + type: ENCHANTED_LEATHER + amount: 1 + result: + type: SMALL_COMBAT_SACK + amount: 1 + + - id: MEDIUM_COMBAT_SACK + rarity: RARE + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aBlaze Rod§7, §aBone§7, §aChili Pepper§7, §aEnder Pearl§7, §aGhast' + - '§aTear§7, §aGunpowder§7, §aMagma Cream§7, §aRotten Flesh§7, §aSlimeball§7,' + - '§aSpider Eye§7, §aString' + - '' + - '§7Capacity: §e6,720 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: e4b2b79a4e060abb00aa88e7c4cd5c0039f5e5cad2d45c1cff5676cb83a1815e + - id: SACK + valid_items: + - BLAZE_ROD + - BONE + - CHILI_PEPPER + - ENDER_PEARL + - GHAST_TEAR + - GUNPOWDER + - MAGMA_CREAM + - ROTTEN_FLESH + - SLIME_BALL + - SPIDER_EYE + - STRING + max_capacity: 6720 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_ROTTEN_FLESH + amount: 4 + B: + type: SMALL_COMBAT_SACK + amount: 1 + result: + type: MEDIUM_COMBAT_SACK + amount: 1 + + - id: LARGE_COMBAT_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7Items: §aBlaze Rod§7, §aBone§7, §aChili Pepper§7, §aEnder Pearl§7, §aGhast' + - '§aTear§7, §aGunpowder§7, §aMagma Cream§7, §aRotten Flesh§7, §aSlimeball§7,' + - '§aSpider Eye§7, §aString' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: 1c13c4774c82c07071e6d1408717b1e3eac56186042a5803fc174452e32a254a + - id: SACK + valid_items: + - BLAZE_ROD + - BONE + - CHILI_PEPPER + - ENDER_PEARL + - GHAST_TEAR + - GUNPOWDER + - MAGMA_CREAM + - ROTTEN_FLESH + - SLIME_BALL + - SPIDER_EYE + - STRING + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - AAA + - ABA + - AAA + ingredients: + A: + type: ENCHANTED_ROTTEN_FLESH + amount: 8 + B: + type: MEDIUM_COMBAT_SACK + amount: 1 + result: + type: LARGE_COMBAT_SACK + amount: 1 + + - id: LARGE_ENCHANTED_COMBAT_SACK + rarity: EPIC + lore: + - '§7Item pickups go directly into your' + - '§7sacks.' + - '' + - '§7This sack can contain all enchanted versions' + - '§7of these materials:' + - '§aBlaze Rod§7, §aBone§7, §aChili Pepper§7, §aEnder Pearl§7,' + - '§aGhast Tear§7, §aGunpowder§7, §aMagma Cream§7, §aRotten' + - '§aFlesh§7, §aSlimeball§7, §aSpider Eye§7, §aString' + - '' + - '§7Capacity: §e20,160 per item' + - '§8Sacks sum their capacity.' + - '' + - '§eRight Click to open sack!' + components: + - id: SKULL_HEAD + texture: c2a3420697256517d5361b3463019647c0689725b3489f9dd24a22ddd40bd41f + - id: SACK + valid_items: + - ABSOLUTE_ENDER_PEARL + - ENCHANTED_BLAZE_POWDER + - ENCHANTED_BLAZE_ROD + - ENCHANTED_BONE + - ENCHANTED_BONE_BLOCK + - ENCHANTED_ENDER_PEARL + - ENCHANTED_EYE_OF_ENDER + - ENCHANTED_GHAST_TEAR + - ENCHANTED_GUNPOWDER + - ENCHANTED_MAGMA_CREAM + - ENCHANTED_ROTTEN_FLESH + - ENCHANTED_SLIME_BLOCK + - ENCHANTED_SLIME_BALL + - ENCHANTED_SPIDER_EYE + - ENCHANTED_STRING + - SILVER_FANG + - STUFFED_CHILI_PEPPER + - WHIPPED_MAGMA_CREAM + max_capacity: 20160 + - id: DEFAULT_CRAFTABLE + default-craftable: false + recipes: + - type: SHAPED + recipe-type: MINING + pattern: + - ABA + - ACA + - AAA + ingredients: + A: + type: ENCHANTED_ROTTEN_FLESH + amount: 16 + B: + type: ENCHANTED_STRING + amount: 16 + C: + type: ENCHANTED_LEATHER + amount: 12 + result: + type: LARGE_ENCHANTED_COMBAT_SACK + amount: 1 \ No newline at end of file