Skip to content

Commit 935edde

Browse files
feat: categorize 195 missing items into proper YAML config files
Distribute items from master's ItemType.java into appropriate category files instead of a single uncategorized dump: - vanilla/blocks: 38 building blocks and decorative items - vanilla/items: 25 common vanilla items (crops, mob drops, etc) - combat/drops: 21 combat drops and materials - weapons: 18 melee weapons including katanas - bows: 6 ranged weapons - mining/dwarven: 12 mining materials - foraging: 12 foraging items - fishing/vanilla: 7 fishing items - armor/miner: 13 armor pieces (chainmail, miner, dwarf) - accessories: 5 talismans and dice - miscellaneous/dungeon: 7 dungeon items - miscellaneous: 20 slayer drops, mythological, and misc items - darkauction: 3 dark auction items - brewing: 5 distillates
1 parent 1746bc4 commit 935edde

26 files changed

Lines changed: 705 additions & 602 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public enum ItemType {
318318

319319
BLAZE_ROD_DISTILLATE(Material.PLAYER_HEAD, Rarity.RARE),
320320

321-
BLOCK_DATA_TOOL(Material.COMPARATOR, Rarity.ADMIN),
321+
BLOCK_DATA_TOOL(Material.BARRIER, Rarity.ADMIN),
322322

323323
BLOCK_ZAPPER(Material.BARRIER, Rarity.COMMON),
324324

@@ -2734,7 +2734,7 @@ public enum ItemType {
27342734

27352735
REGENERATION_POTION_1(Material.POTION, Rarity.COMMON),
27362736

2737-
REGION_SELECTOR(Material.BLAZE_ROD, Rarity.ADMIN),
2737+
REGION_SELECTOR(Material.BARRIER, Rarity.ADMIN),
27382738

27392739
RELIC_OF_COINS(Material.PLAYER_HEAD, Rarity.EPIC),
27402740

configuration/skyblock/items/accessories/accessories.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,20 @@ items:
8080
components:
8181
- id: SKULL_HEAD
8282
texture: 9c11d6c79b8a1f18902d783cdda4bdfb9d47337b73791028a126a6e6cf101def
83-
- id: TALISMAN
83+
- id: TALISMAN
84+
85+
- id: SKELETON_TALISMAN
86+
rarity: COMMON
87+
material: SKELETON_SKULL
88+
- id: BLUE_RING
89+
rarity: UNCOMMON
90+
material: PLAYER_HEAD
91+
- id: ARCHFIEND_DICE
92+
rarity: EPIC
93+
material: PLAYER_HEAD
94+
- id: HIGH_CLASS_ARCHFIEND_DICE
95+
rarity: LEGENDARY
96+
material: PLAYER_HEAD
97+
- id: SINFUL_DICE
98+
rarity: EPIC
99+
material: PLAYER_HEAD

configuration/skyblock/items/armor/miner.yml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,43 @@ items:
3434
standard_item_type: BOOTS
3535
default_statistics:
3636
defense: 15.0
37-
mining_speed: 10.0
37+
mining_speed: 10.0
38+
- id: CHAINMAIL_HELMET
39+
rarity: COMMON
40+
material: CHAINMAIL_HELMET
41+
- id: CHAINMAIL_CHESTPLATE
42+
rarity: COMMON
43+
material: CHAINMAIL_CHESTPLATE
44+
- id: CHAINMAIL_LEGGINGS
45+
rarity: COMMON
46+
material: CHAINMAIL_LEGGINGS
47+
- id: CHAINMAIL_BOOTS
48+
rarity: COMMON
49+
material: CHAINMAIL_BOOTS
50+
- id: MINER_ARMOR_HELMET
51+
rarity: RARE
52+
material: IRON_HELMET
53+
- id: MINER_ARMOR_CHESTPLATE
54+
rarity: RARE
55+
material: IRON_CHESTPLATE
56+
- id: MINER_ARMOR_LEGGINGS
57+
rarity: RARE
58+
material: IRON_LEGGINGS
59+
- id: MINER_ARMOR_BOOTS
60+
rarity: RARE
61+
material: IRON_BOOTS
62+
- id: MINERS_OUTFIT_HELMET
63+
rarity: UNCOMMON
64+
material: LEATHER_HELMET
65+
- id: MINERS_OUTFIT_CHESTPLATE
66+
rarity: UNCOMMON
67+
material: LEATHER_CHESTPLATE
68+
- id: MINERS_OUTFIT_LEGGINGS
69+
rarity: UNCOMMON
70+
material: LEATHER_LEGGINGS
71+
- id: MINERS_OUTFIT_BOOTS
72+
rarity: UNCOMMON
73+
material: LEATHER_BOOTS
74+
- id: DWARF_TURTLE_SHELMET
75+
rarity: RARE
76+
material: PLAYER_HEAD
Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1-
items:
1+
items:
2+
- id: ARTISANAL_SHORTBOW
3+
rarity: RARE
4+
material: BOW
5+
6+
- id: JUJU_SHORTBOW
7+
rarity: EPIC
8+
material: BOW
9+
10+
- id: MOSQUITO_BOW
11+
rarity: LEGENDARY
12+
material: BOW
13+
14+
- id: SCORPION_BOW
15+
rarity: EPIC
16+
material: BOW
17+
18+
- id: TERMINATOR
19+
rarity: LEGENDARY
20+
material: BOW
21+
22+
- id: WITHER_BOW
23+
rarity: UNCOMMON
24+
material: BOW

configuration/skyblock/items/brewing.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,18 @@ items:
304304
- id: CUSTOM_DISPLAY_NAME
305305
display_name: Zombie Brain Mixin
306306
- id: NOT_FINISHED_YET
307+
- id: BLAZE_ROD_DISTILLATE
308+
rarity: RARE
309+
material: PLAYER_HEAD
310+
- id: GABAGOOL_DISTILLATE
311+
rarity: RARE
312+
material: PLAYER_HEAD
313+
- id: GLOWSTONE_DISTILLATE
314+
rarity: RARE
315+
material: PLAYER_HEAD
316+
- id: MAGMA_CREAM_DISTILLATE
317+
rarity: RARE
318+
material: PLAYER_HEAD
319+
- id: NETHER_WART_DISTILLATE
320+
rarity: RARE
321+
material: PLAYER_HEAD

configuration/skyblock/items/combat/drops.yml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,87 @@ items:
9494
- id: TRACKED_UNIQUE
9595
- id: RIGHT_CLICK_RECIPE
9696
recipe_item: WARDEN_HELMET
97+
98+
- id: ANCIENT_CLAW
99+
rarity: RARE
100+
material: FLINT
101+
102+
- id: WOLF_TOOTH
103+
rarity: UNCOMMON
104+
material: GHAST_TEAR
105+
106+
- id: SPIDER_CATALYST
107+
rarity: RARE
108+
material: PLAYER_HEAD
109+
110+
- id: TARANTULA_SILK
111+
rarity: RARE
112+
material: COBWEB
113+
114+
- id: TARANTULA_WEB
115+
rarity: UNCOMMON
116+
material: STRING
117+
118+
- id: OVERFLUX_CAPACITOR
119+
rarity: EPIC
120+
material: QUARTZ
121+
122+
- id: GRIFFIN_FEATHER
123+
rarity: RARE
124+
material: FEATHER
125+
126+
- id: BRAIDED_GRIFFIN_FEATHER
127+
rarity: EPIC
128+
material: STRING
129+
130+
- id: DAEDALUS_STICK
131+
rarity: LEGENDARY
132+
material: STICK
133+
134+
- id: GOLDEN_TOOTH
135+
rarity: RARE
136+
material: GOLD_NUGGET
137+
138+
- id: DIGESTED_MOSQUITO
139+
rarity: LEGENDARY
140+
material: ROTTEN_FLESH
141+
142+
- id: TOXIC_ARROW_POISON
143+
rarity: UNCOMMON
144+
material: LIME_DYE
145+
146+
- id: TWILIGHT_ARROW_POISON
147+
rarity: UNCOMMON
148+
material: PURPLE_DYE
149+
150+
- id: BUNDLE_OF_MAGMA_ARROWS
151+
rarity: EPIC
152+
material: PLAYER_HEAD
153+
154+
- id: BONZO_FRAGMENT
155+
rarity: RARE
156+
material: RED_MUSHROOM
157+
158+
- id: FLEXBONE
159+
rarity: COMMON
160+
material: BONE
161+
162+
- id: STURDY_BONE
163+
rarity: COMMON
164+
material: PLAYER_HEAD
165+
166+
- id: DERELICT_ASHE
167+
rarity: UNCOMMON
168+
material: GUNPOWDER
169+
170+
- id: SUMMONING_EYE
171+
rarity: EPIC
172+
material: PLAYER_HEAD
173+
174+
- id: TESSELLATED_ENDER_PEARL
175+
rarity: LEGENDARY
176+
material: PLAYER_HEAD
177+
178+
- id: SCORCHED_POWER_CRYSTAL
179+
rarity: LEGENDARY
180+
material: PLAYER_HEAD

configuration/skyblock/items/darkauction.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,13 @@ items:
5252
is_absolute: false
5353
default_statistics:
5454
damage: 170.0
55+
56+
- id: BIGFOOT_LASSO
57+
rarity: EPIC
58+
material: LEAD
59+
- id: WEIRD_TUBA
60+
rarity: RARE
61+
material: HOPPER
62+
- id: HAMSTER_WHEEL
63+
rarity: RARE
64+
material: OAK_TRAPDOOR

configuration/skyblock/items/fishing/vanilla.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,24 @@ items:
6969
components:
7070
- id: SELLABLE
7171
value: 20.0
72+
- id: CHUM
73+
rarity: UNCOMMON
74+
material: PLAYER_HEAD
75+
- id: CAN_OF_WORMS
76+
rarity: UNCOMMON
77+
material: PLAYER_HEAD
78+
- id: GILL_MEMBRANE
79+
rarity: COMMON
80+
material: PLAYER_HEAD
81+
- id: SEA_LUMIES
82+
rarity: COMMON
83+
material: SEA_PICKLE
84+
- id: OLD_LEATHER_BOOT
85+
rarity: UNCOMMON
86+
material: PLAYER_HEAD
87+
- id: GRIZZLY_SALMON
88+
rarity: RARE
89+
material: COOKED_SALMON
90+
- id: WASHED_UP_SOUVENIR
91+
rarity: LEGENDARY
92+
material: PLAYER_HEAD

configuration/skyblock/items/foraging/foraging.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,39 @@ items:
3030
- id: REFORGABLE
3131
reforge_type: AXES
3232
- id: NOT_FINISHED_YET
33+
- id: FIG_LOG
34+
rarity: COMMON
35+
material: STRIPPED_SPRUCE_LOG
36+
- id: FIGSTONE
37+
rarity: COMMON
38+
material: PLAYER_HEAD
39+
- id: LUSHLILAC
40+
rarity: COMMON
41+
material: PLAYER_HEAD
42+
- id: MANGCORE
43+
rarity: COMMON
44+
material: PLAYER_HEAD
45+
- id: VINESAP
46+
rarity: COMMON
47+
material: PLAYER_HEAD
48+
- id: TENDER_WOOD
49+
rarity: COMMON
50+
material: PLAYER_HEAD
51+
- id: DEEP_ROOT
52+
rarity: COMMON
53+
material: PLAYER_HEAD
54+
- id: BIOFUEL
55+
rarity: RARE
56+
material: GREEN_DYE
57+
- id: ENDSTONE_ROSE
58+
rarity: RARE
59+
material: POPPY
60+
- id: GLOWING_MUSHROOM
61+
rarity: UNCOMMON
62+
material: PLAYER_HEAD
63+
- id: HALF_EATEN_MUSHROOM
64+
rarity: UNCOMMON
65+
material: PLAYER_HEAD
66+
- id: WET_WATER
67+
rarity: COMMON
68+
material: PLAYER_HEAD

configuration/skyblock/items/mining/dwarven.yml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,40 @@ items:
108108
- id: SKULL_HEAD
109109
texture: f106277ad541aa76d9d4a19e7aac92621a3f0251ff9427dfdea539b51dd8d1ea
110110
- id: DEFAULT_SOULBOUND
111-
coop_allowed: true
111+
coop_allowed: true
112+
- id: GLACITE
113+
rarity: COMMON
114+
material: PACKED_ICE
115+
- id: ENCHANTED_GLACITE
116+
rarity: UNCOMMON
117+
material: PACKED_ICE
118+
- id: TUNGSTEN
119+
rarity: COMMON
120+
material: PLAYER_HEAD
121+
- id: ENCHANTED_TUNGSTEN
122+
rarity: UNCOMMON
123+
material: PLAYER_HEAD
124+
- id: UMBER
125+
rarity: COMMON
126+
material: PLAYER_HEAD
127+
- id: ENCHANTED_UMBER
128+
rarity: UNCOMMON
129+
material: PLAYER_HEAD
130+
- id: SULPHUR
131+
rarity: UNCOMMON
132+
material: GLOWSTONE_DUST
133+
- id: REFINED_MINERAL
134+
rarity: COMMON
135+
material: LIGHT_BLUE_DYE
136+
- id: MANA_DISINTEGRATOR
137+
rarity: RARE
138+
material: PLAYER_HEAD
139+
- id: KELVIN_INVERTER
140+
rarity: RARE
141+
material: PLAYER_HEAD
142+
- id: SUBZERO_INVERTER
143+
rarity: LEGENDARY
144+
material: PLAYER_HEAD
145+
- id: PROMISING_SHOVEL
146+
rarity: UNCOMMON
147+
material: IRON_SHOVEL

0 commit comments

Comments
 (0)