Skip to content

Commit 47fc702

Browse files
committed
updated collections
1 parent 1a6b1bb commit 47fc702

84 files changed

Lines changed: 2632 additions & 1753 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public enum ItemType {
389389
GOLD_MINION(Material.PLAYER_HEAD, Rarity.RARE),
390390
LAPIS_MINION(Material.PLAYER_HEAD, Rarity.RARE),
391391
REDSTONE_MINION(Material.PLAYER_HEAD, Rarity.RARE),
392-
ENDSTONE_MINION(Material.PLAYER_HEAD, Rarity.RARE),
392+
END_STONE_MINION(Material.PLAYER_HEAD, Rarity.RARE),
393393
ICE_MINION(Material.PLAYER_HEAD, Rarity.RARE),
394394
QUARTZ_MINION(Material.PLAYER_HEAD, Rarity.RARE),
395395
OBSIDIAN_MINION(Material.PLAYER_HEAD, Rarity.RARE),
@@ -823,6 +823,10 @@ public enum ItemType {
823823
MINER_ARMOR_CHESTPLATE(Material.IRON_CHESTPLATE, Rarity.RARE),
824824
MINER_ARMOR_LEGGINGS(Material.IRON_LEGGINGS, Rarity.RARE),
825825
MINER_ARMOR_BOOTS(Material.IRON_BOOTS, Rarity.RARE),
826+
MINER_OUTFIT_HELMET(Material.LEATHER_HELMET, Rarity.UNCOMMON),
827+
MINER_OUTFIT_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.UNCOMMON),
828+
MINER_OUTFIT_LEGGINGS(Material.LEATHER_LEGGINGS, Rarity.UNCOMMON),
829+
MINER_OUTFIT_BOOTS(Material.LEATHER_BOOTS, Rarity.UNCOMMON),
826830

827831
CHARLIE_TROUSERS(Material.LEATHER_LEGGINGS, Rarity.COMMON),
828832
KELLY_TSHIRT(Material.LEATHER_CHESTPLATE, Rarity.COMMON),
@@ -1739,18 +1743,21 @@ public enum ItemType {
17391743
HOPPER_MINECART(Material.HOPPER_MINECART, Rarity.COMMON),
17401744
TNT_MINECART(Material.TNT_MINECART, Rarity.COMMON),
17411745
FURNACE_MINECART(Material.FURNACE_MINECART, Rarity.COMMON),
1746+
FIREWORK_ROCKET(Material.FIREWORK_ROCKET, Rarity.COMMON),
1747+
MILK_BUCKET(Material.MILK_BUCKET, Rarity.COMMON),
17421748

17431749
/**
17441750
* Enchanted Items
17451751
*/
17461752
ENCHANTED_ACACIA_LOG(Material.ACACIA_LOG, Rarity.UNCOMMON),
17471753
ENCHANTED_BAKED_POTATO(Material.BAKED_POTATO, Rarity.UNCOMMON),
17481754
ENCHANTED_BIRCH_LOG(Material.BIRCH_LOG, Rarity.UNCOMMON),
1749-
ENCHANTED_SLIMEBALL(Material.SLIME_BALL, Rarity.UNCOMMON),
1755+
ENCHANTED_SLIME_BALL(Material.SLIME_BALL, Rarity.UNCOMMON),
17501756
ENCHANTED_BLAZE_ROD(Material.BLAZE_ROD, Rarity.UNCOMMON),
17511757
ENCHANTED_BLAZE_POWDER(Material.BLAZE_POWDER, Rarity.UNCOMMON),
17521758
ENCHANTED_BONE(Material.BONE, Rarity.UNCOMMON),
17531759
ENCHANTED_CARROT(Material.CARROT, Rarity.UNCOMMON),
1760+
ENCHANTED_CAKE(Material.CAKE, Rarity.UNCOMMON),
17541761
ENCHANTED_CHARCOAL(Material.CHARCOAL, Rarity.UNCOMMON),
17551762
ENCHANTED_COAL(Material.COAL, Rarity.UNCOMMON),
17561763
ENCHANTED_COBBLESTONE(Material.COBBLESTONE, Rarity.UNCOMMON),
@@ -1794,7 +1801,7 @@ public enum ItemType {
17941801
ENCHANTED_MAGMA_CREAM(Material.MAGMA_CREAM, Rarity.UNCOMMON),
17951802
ENCHANTED_BROWN_MUSHROOM_BLOCK(Material.BROWN_MUSHROOM_BLOCK, Rarity.RARE),
17961803
ENCHANTED_CLAY(Material.CLAY_BALL, Rarity.UNCOMMON),
1797-
ENCHANTED_CLOWNFISH(Material.TROPICAL_FISH, Rarity.UNCOMMON),
1804+
ENCHANTED_TROPICAL_FISH(Material.TROPICAL_FISH, Rarity.UNCOMMON),
17981805
ENCHANTED_COD(Material.COD, Rarity.UNCOMMON),
17991806
ENCHANTED_COOKED_COD(Material.COOKED_COD, Rarity.RARE),
18001807
ENCHANTED_MUTTON(Material.MUTTON, Rarity.UNCOMMON),
@@ -1858,6 +1865,7 @@ public enum ItemType {
18581865
ENCHANTED_RED_SAND(Material.RED_SAND, Rarity.UNCOMMON),
18591866
ENCHANTED_RED_SAND_CUBE(Material.PLAYER_HEAD, Rarity.RARE),
18601867
ENCHANTED_BONE_MEAL(Material.BONE_MEAL, Rarity.COMMON),
1868+
ENCHANTED_WHEAT(Material.WHEAT, Rarity.UNCOMMON),
18611869
;
18621870

18631871
public final Material material;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public enum ItemStatistic {
1212
DEFENSE("Defense", "§a", "§a", false, "❈"),
1313
STRENGTH("Strength", "§c", "§c", false, "❁"),
1414
INTELLIGENCE("Intelligence", "§a", "§b", false, "✎"),
15-
CRIT_CHANCE("Crit Chance", "§c", "§9",
15+
CRITICAL_CHANCE("Crit Chance", "§c", "§9",
1616
true, "☣", 30D, 1D),
17-
CRIT_DAMAGE("Crit Damage", "§c", "§9",
17+
CRITICAL_DAMAGE("Crit Damage", "§c", "§9",
1818
true, "☠", 50D, 1D),
1919
BONUS_ATTACK_SPEED("Bonus Attack Speed", "§c", "§e", true, "⚔"),
2020
ABILITY_DAMAGE("Ability Damage", "§c", "§c", true, "๑"),

0 commit comments

Comments
 (0)