Skip to content

Commit f362e8b

Browse files
aunncodesaunncodes
authored
Merge pull request #2 from ArikSquad/feat/m-1
2 parents 4a5a1df + 2d2814e commit f362e8b

55 files changed

Lines changed: 2867 additions & 572 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/item/ItemType.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public enum ItemType {
2323
ENDSTONE_ROSE(Material.POPPY, Rarity.RARE),
2424
BIOFUEL(Material.GREEN_DYE, Rarity.RARE),
2525

26+
ABIPHONE_BASIC(Material.PLAYER_HEAD, Rarity.COMMON),
27+
ABIPHONE_X_RED(Material.PLAYER_HEAD, Rarity.UNCOMMON),
28+
2629
/**
2730
* Accessories
2831
*/
@@ -560,6 +563,10 @@ public enum ItemType {
560563
PUMPKIN_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.COMMON),
561564
PUMPKIN_LEGGINGS(Material.LEATHER_LEGGINGS, Rarity.COMMON),
562565
PUMPKIN_BOOTS(Material.LEATHER_BOOTS, Rarity.COMMON),
566+
LAPIS_ARMOR_HELMET(Material.SEA_LANTERN, Rarity.UNCOMMON),
567+
LAPIS_ARMOR_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.UNCOMMON),
568+
LAPIS_ARMOR_LEGGINGS(Material.SEA_LANTERN, Rarity.UNCOMMON),
569+
LAPIS_ARMOR_BOOTS(Material.LEATHER_BOOTS, Rarity.UNCOMMON),
563570

564571
/**
565572
* Pickaxes

‎configuration/skyblock/collections/combat.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ collections:
1717
- type: XP
1818
data:
1919
xp: 4
20+
- type: CUSTOM_AWARD
21+
data:
22+
customAward: FIRE_ASPECT_DISCOUNT
2023
- amount: 1000
2124
rewards:
2225
- type: XP
@@ -332,6 +335,9 @@ collections:
332335
- type: XP
333336
data:
334337
xp: 4
338+
- type: CUSTOM_AWARD
339+
data:
340+
customAward: GIANT_KILLER_DISCOUNT
335341
- amount: 1000
336342
rewards:
337343
- type: XP
@@ -342,6 +348,9 @@ collections:
342348
- type: XP
343349
data:
344350
xp: 4
351+
- type: CUSTOM_AWARD
352+
data:
353+
customAward: VAMPIRISM_DISCOUNT
345354
- amount: 5000
346355
rewards:
347356
- type: XP
@@ -410,6 +419,9 @@ collections:
410419
- type: XP
411420
data:
412421
xp: 4
422+
- type: CUSTOM_AWARD
423+
data:
424+
customAward: THUNDERLORD_DISCOUNT
413425
- amount: 5000
414426
rewards:
415427
- type: XP
@@ -590,6 +602,9 @@ collections:
590602
- type: XP
591603
data:
592604
xp: 4
605+
- type: CUSTOM_AWARD
606+
data:
607+
customAward: KNOCKBACK_DISCOUNT
593608
- amount: 1000
594609
rewards:
595610
- type: XP
@@ -669,11 +684,17 @@ collections:
669684
- type: XP
670685
data:
671686
xp: 4
687+
- type: CUSTOM_AWARD
688+
data:
689+
customAward: BANE_OF_ARTHROPODS_DISCOUNT
672690
- amount: 5000
673691
rewards:
674692
- type: XP
675693
data:
676694
xp: 4
695+
- type: CUSTOM_AWARD
696+
data:
697+
customAward: VENOMOUS_DISCOUNT
677698
- amount: 10000
678699
rewards:
679700
- type: XP

‎configuration/skyblock/collections/farming.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,9 @@ collections:
10441044
- type: XP
10451045
data:
10461046
xp: 4
1047+
- type: CUSTOM_AWARD
1048+
data:
1049+
customAward: CUBISM_DISCOUNT
10471050
- amount: 2500
10481051
rewards:
10491052
- type: XP

‎configuration/skyblock/collections/fishing.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ collections:
314314
- type: XP
315315
data:
316316
xp: 4
317+
- type: CUSTOM_AWARD
318+
data:
319+
customAward: IMPALING_DISCOUNT
317320
- amount: 25
318321
rewards:
319322
- type: XP
@@ -383,6 +386,9 @@ collections:
383386
- type: XP
384387
data:
385388
xp: 4
389+
- type: CUSTOM_AWARD
390+
data:
391+
customAward: CLEAVE_DISCOUNT
386392
- amount: 150
387393
rewards:
388394
- type: XP

‎configuration/skyblock/collections/mining.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,14 @@ collections:
350350
- type: XP
351351
data:
352352
xp: 4
353+
- type: CUSTOM_AWARD
354+
data:
355+
customAward: FORTUNE_DISCOUNT
356+
- amount: 500000
357+
rewards:
358+
- type: XP
359+
data:
360+
xp: 4
353361
- itemType: LAPIS_LAZULI
354362
rewards:
355363
- amount: 250
@@ -371,6 +379,9 @@ collections:
371379
- type: XP
372380
data:
373381
xp: 4
382+
- type: CUSTOM_AWARD
383+
data:
384+
customAward: EXPERIENCE_DISCOUNT
374385
- amount: 2000
375386
rewards:
376387
- type: XP
@@ -497,6 +508,9 @@ collections:
497508
- type: XP
498509
data:
499510
xp: 4
511+
- type: CUSTOM_AWARD
512+
data:
513+
customAward: EXECUTE_DISCOUNT
500514
- amount: 250
501515
rewards:
502516
- type: XP
@@ -1290,6 +1304,9 @@ collections:
12901304
- type: XP
12911305
data:
12921306
xp: 4
1307+
- type: CUSTOM_AWARD
1308+
data:
1309+
customAward: LETHALITY_DISCOUNT
12931310
- amount: 250
12941311
rewards:
12951312
- type: XP

‎configuration/skyblock/items/armor/lapis.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
items:
2+
- id: LAPIS_HELMET
3+
rarity: COMMON
4+
default_statistics:
5+
defense: 25
6+
mining_speed: 20
7+
mining_fortune: 2
8+
components:
9+
- id: CUSTOM_DISPLAY_NAME
10+
display_name: Lapis Armor Helmet
11+
- id: STANDARD_ITEM
12+
standard_item_type: HELMET
13+
- id: LEATHER_COLOR
14+
r: '122'
15+
g: '121'
16+
b: '100'
17+
- id: SELLABLE
18+
value: 1000.0
19+
- id: TRACKED_UNIQUE
20+
- id: MUSEUM
21+
museum_category: ARMOR_SETS
22+
- id: LAPIS_CHESTPLATE
23+
rarity: COMMON
24+
default_statistics:
25+
defense: 40
26+
mining_speed: 20
27+
mining_fortune: 2
28+
components:
29+
- id: CUSTOM_DISPLAY_NAME
30+
display_name: Lapis Armor Chestplate
31+
- id: STANDARD_ITEM
32+
standard_item_type: CHESTPLATE
33+
- id: LEATHER_COLOR
34+
r: '122'
35+
g: '121'
36+
b: '100'
37+
- id: SELLABLE
38+
value: 2000.0
39+
- id: TRACKED_UNIQUE
40+
- id: MUSEUM
41+
museum_category: ARMOR_SETS
42+
- id: LAPIS_LEGGINGS
43+
rarity: COMMON
44+
default_statistics:
45+
defense: 35
46+
mining_speed: 20
47+
mining_fortune: 2
48+
components:
49+
- id: CUSTOM_DISPLAY_NAME
50+
display_name: Lapis Armor Leggings
51+
- id: STANDARD_ITEM
52+
standard_item_type: LEGGINGS
53+
- id: LEATHER_COLOR
54+
r: '122'
55+
g: '121'
56+
b: '100'
57+
- id: SELLABLE
58+
value: 1750.0
59+
- id: TRACKED_UNIQUE
60+
- id: MUSEUM
61+
museum_category: ARMOR_SETS
62+
- id: LAPIS_BOOTS
63+
rarity: COMMON
64+
default_statistics:
65+
defense: 20
66+
mining_speed: 20
67+
mining_fortune: 2
68+
components:
69+
- id: CUSTOM_DISPLAY_NAME
70+
display_name: Lapis Armor Boots
71+
- id: STANDARD_ITEM
72+
standard_item_type: BOOTS
73+
- id: LEATHER_COLOR
74+
r: '122'
75+
g: '121'
76+
b: '100'
77+
- id: SELLABLE
78+
value: 1000.0
79+
- id: TRACKED_UNIQUE
80+
- id: MUSEUM
81+
museum_category: ARMOR_SETS

‎configuration/skyblock/items/miscellaneous/abiphones.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
items:
2+
- id: ABIPHONE_BASIC
3+
material: PLAYER_HEAD
4+
rarity: COMMON
5+
lore:
6+
- "§7A device that can be used to contact"
7+
- "§7people! Click NPCs to add them to your contacts!"
8+
components:
9+
- id: SELLABLE
10+
value: 100000.0
11+
- id: SKULL_HEAD
12+
texture: e471c673a875425428d4b5ecf78a24d86ea65ae6599633e6514bbaafd7fa561f
13+
- id: ABIPHONE_X_RED
14+
material: PLAYER_HEAD
15+
rarity: COMMON
16+
lore:
17+
- "§7A device that can be used to contact"
18+
- "§7people! Click NPCs to add them to your contacts!"
19+
components:
20+
- id: SELLABLE
21+
value: 1000000.0
22+
- id: SKULL_HEAD
23+
texture: d256584eea6825150a415fc18daa532b9139cca454f969f2210355de10a15a4

‎configuration/skyblock/items/vanilla/blocks/others.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
items:
2+
- id: BOOKSHELF
3+
material: BOOKSHELF
4+
rarity: COMMON
5+
components:
6+
- id: CUSTOM_DROP
7+
rules:
8+
- conditions:
9+
silk_touch: true
10+
drops:
11+
- item: BOOKSHELF
12+
chance: 1.0
13+
amount: 1
14+
- conditions:
15+
drops:
16+
- item: BOOK
17+
chance: 1.0
18+
amount: 3
19+
- id: PLACEABLE
20+
- id: SELLABLE
21+
value: 20
22+
- id: DEFAULT_CRAFTABLE
23+
recipes:
24+
- type: SHAPED
25+
recipe-type: NONE
26+
pattern:
27+
- AAA
28+
- BBB
29+
- AAA
30+
ingredients:
31+
A:
32+
type: OAK_PLANKS
33+
amount: 1
34+
B:
35+
type: BOOK
36+
amount: 1
37+
result:
38+
type: BOOKSHELF
39+
amount: 1

‎configuration/skyblock/items/weapons.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ items:
22
- id: ASPECT_OF_THE_END
33
material: DIAMOND_SWORD
44
rarity: RARE
5+
abilities:
6+
- INSTANT_TRANSMISSION
57
default_statistics:
68
damage: 100
79
strength: 100

0 commit comments

Comments
 (0)