Merge pull request #667 from ItzKatze/master

more sacks

Author: ItzKatze

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

@@ -371,6 +371,27 @@ 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),
+
+	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),
+
+	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),
+
+    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
@@ -541,7 +562,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),
@@ -551,8 +572,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),
@@ -573,6 +592,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
@@ -587,6 +621,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
@@ -971,6 +1019,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 +1069,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
@@ -1164,8 +1220,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),
@@ -1215,6 +1271,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 +1756,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),
@@ -1801,10 +1859,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),
@@ -1867,6 +1926,17 @@ 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),
+	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;

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