Skip to content

Commit 36b005e

Browse files
Swofty-DevelopmentsSwofty-Developments
authored
Merge pull request #500 from ItzKatze/master
added smelting touch and changed some items
2 parents ff39f80 + cd01afe commit 36b005e

7 files changed

Lines changed: 882 additions & 90 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,13 +737,13 @@ public enum ItemType {
737737
SPRUCE_SAPLING(Material.SPRUCE_SAPLING, Rarity.COMMON ),
738738
BIRCH_SAPLING(Material.BIRCH_SAPLING, Rarity.COMMON ),
739739
JUNGLE_SAPLING(Material.JUNGLE_SAPLING, Rarity.COMMON ),
740+
ACACIA_SAPLING(Material.ACACIA_SAPLING, Rarity.COMMON ),
741+
DARK_OAK_SAPLING(Material.DARK_OAK_SAPLING, Rarity.COMMON ),
740742
FLOWER_POT(Material.FLOWER_POT, Rarity.COMMON ),
741743
FERN(Material.FERN, Rarity.COMMON ),
742744
DEAD_BUSH(Material.DEAD_BUSH, Rarity.COMMON ),
743745
WATER_BUCKET(Material.WATER_BUCKET, Rarity.COMMON ),
744746
LARGE_FERN(Material.LARGE_FERN, Rarity.COMMON ),
745-
ACACIA_SAPLING(Material.ACACIA_SAPLING, Rarity.COMMON ),
746-
DARK_OAK_SAPLING(Material.DARK_OAK_SAPLING, Rarity.COMMON ),
747747
STICK(Material.STICK, Rarity.COMMON),
748748
ACACIA_WOOD(Material.ACACIA_WOOD, Rarity.COMMON),
749749
BAKED_POTATO(Material.BAKED_POTATO, Rarity.COMMON),
@@ -867,6 +867,7 @@ public enum ItemType {
867867
MYCELIUM(Material.MYCELIUM, Rarity.COMMON),
868868
RED_SAND(Material.RED_SAND, Rarity.COMMON),
869869
QUARTZ(Material.QUARTZ, Rarity.COMMON),
870+
NETHER_QUARTZ_ORE(Material.NETHER_QUARTZ_ORE, Rarity.COMMON),
870871
NETHERRACK(Material.NETHERRACK, Rarity.COMMON),
871872
NETHER_BRICK(Material.NETHER_BRICK, Rarity.COMMON),
872873
SAND(Material.SAND, Rarity.COMMON),

‎configuration/items/farming/vanilla.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ items:
77
- id: CACTUS
88
rarity: COMMON
99
components:
10+
- id: CUSTOM_DROP
11+
rules:
12+
- conditions:
13+
smelting_touch: true
14+
drops:
15+
- item: CACTUS_GREEN
16+
chance: 1.0
17+
amount: 1
1018
- id: SKILLABLE_MINE
1119
category: FARMING
1220
mining_value: 2.0
@@ -20,6 +28,13 @@ items:
2028
- id: CARROT
2129
rarity: COMMON
2230
components:
31+
- id: CUSTOM_DROP
32+
rules:
33+
- conditions:
34+
drops:
35+
- item: CARROT
36+
chance: 1.0
37+
amount: 2-5
2338
- id: SKILLABLE_MINE
2439
category: FARMING
2540
mining_value: 4.0
@@ -28,6 +43,13 @@ items:
2843
- id: COCOA_BEAN
2944
rarity: COMMON
3045
components:
46+
- id: CUSTOM_DROP
47+
rules:
48+
- conditions:
49+
drops:
50+
- item: COCOA_BEAN
51+
chance: 1.0
52+
amount: 3
3153
- id: SKILLABLE_MINE
3254
category: FARMING
3355
mining_value: 4.0
@@ -209,6 +231,19 @@ items:
209231
- id: MELON_BLOCK
210232
rarity: COMMON
211233
components:
234+
- id: CUSTOM_DROP
235+
rules:
236+
- conditions:
237+
silk_touch: true
238+
drops:
239+
- item: MELON_BLOCK
240+
chance: 1.0
241+
amount: 1
242+
- conditions:
243+
drops:
244+
- item: MELON_SLICE
245+
chance: 1.0
246+
amount: 3-7
212247
- id: SKILLABLE_MINE
213248
category: FARMING
214249
mining_value: 4.0
@@ -246,6 +281,13 @@ items:
246281
- id: NETHER_WART
247282
rarity: COMMON
248283
components:
284+
- id: CUSTOM_DROP
285+
rules:
286+
- conditions:
287+
drops:
288+
- item: NETHER_WART
289+
chance: 1.0
290+
amount: 2-4
249291
- id: SKILLABLE_MINE
250292
category: FARMING
251293
mining_value: 4.0
@@ -254,6 +296,13 @@ items:
254296
- id: POTATO
255297
rarity: COMMON
256298
components:
299+
- id: CUSTOM_DROP
300+
rules:
301+
- conditions:
302+
drops:
303+
- item: POTATO
304+
chance: 1.0
305+
amount: 2-5
257306
- id: SKILLABLE_MINE
258307
category: FARMING
259308
mining_value: 4.0
@@ -356,6 +405,16 @@ items:
356405
- id: WHEAT
357406
rarity: COMMON
358407
components:
408+
- id: CUSTOM_DROP
409+
rules:
410+
- conditions:
411+
drops:
412+
- item: WHEAT
413+
chance: 1.0
414+
amount: 1
415+
- item: SEEDS
416+
chance: 1.0
417+
amount: 1-4
359418
- id: SKILLABLE_MINE
360419
category: FARMING
361420
mining_value: 4.0

‎configuration/items/mining/vanilla.yml‎

Lines changed: 154 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,35 @@ items:
22
- id: COAL
33
rarity: COMMON
44
components:
5-
- id: SKILLABLE_MINE
6-
category: MINING
7-
mining_value: 5.0
85
- id: SELLABLE
96
value: 2.0
107
- id: MINION_FUEL
118
fuel_percentage: 5.0
129
last_time_ms: 1800000
1310
- id: EXTRA_UNDER_NAME
1411
display: Brewing Ingredient
12+
- id: COAL_ORE
13+
rarity: COMMON
14+
components:
15+
- id: CUSTOM_DROP
16+
rules:
17+
- conditions:
18+
silk_touch: true
19+
drops:
20+
- item: COAL_ORE
21+
chance: 1.0
22+
amount: 1
23+
- conditions:
24+
drops:
25+
- item: COAL
26+
chance: 1.0
27+
amount: 4-6
28+
- id: PLACEABLE
29+
- id: SKILLABLE_MINE
30+
category: MINING
31+
mining_value: 5.0
32+
- id: SELLABLE
33+
value: 4.0
1534
- id: COAL_BLOCK
1635
rarity: COMMON
1736
components:
@@ -39,11 +58,30 @@ items:
3958
- id: DIAMOND
4059
rarity: COMMON
4160
components:
61+
- id: SELLABLE
62+
value: 8.0
63+
- id: DIAMOND_ORE
64+
rarity: COMMON
65+
components:
66+
- id: CUSTOM_DROP
67+
rules:
68+
- conditions:
69+
silk_touch: true
70+
drops:
71+
- item: DIAMOND_ORE
72+
chance: 1.0
73+
amount: 1
74+
- conditions:
75+
drops:
76+
- item: DIAMOND
77+
chance: 1.0
78+
amount: 1
79+
- id: PLACEABLE
4280
- id: SKILLABLE_MINE
4381
category: MINING
44-
mining_value: 5.0
82+
mining_value: 10.0
4583
- id: SELLABLE
46-
value: 8.0
84+
value: 1.0
4785
- id: DIAMOND_BLOCK
4886
rarity: COMMON
4987
components:
@@ -125,11 +163,30 @@ items:
125163
- id: EMERALD
126164
rarity: COMMON
127165
components:
166+
- id: SELLABLE
167+
value: 6.0
168+
- id: EMERALD_ORE
169+
rarity: COMMON
170+
components:
171+
- id: CUSTOM_DROP
172+
rules:
173+
- conditions:
174+
silk_touch: true
175+
drops:
176+
- item: EMERALD_ORE
177+
chance: 1.0
178+
amount: 1
179+
- conditions:
180+
drops:
181+
- item: EMERALD
182+
chance: 1.0
183+
amount: 1
184+
- id: PLACEABLE
128185
- id: SKILLABLE_MINE
129186
category: MINING
130-
mining_value: 5.0
187+
mining_value: 9.0
131188
- id: SELLABLE
132-
value: 6.0
189+
value: 1.0
133190
- id: EMERALD_BLOCK
134191
rarity: COMMON
135192
components:
@@ -168,6 +225,19 @@ items:
168225
- id: GLOWSTONE
169226
rarity: COMMON
170227
components:
228+
- id: CUSTOM_DROP
229+
rules:
230+
- conditions:
231+
silk_touch: true
232+
drops:
233+
- item: GLOWSTONE
234+
chance: 1.0
235+
amount: 1
236+
- conditions:
237+
drops:
238+
- item: GLOWSTONE_DUST
239+
chance: 1.0
240+
amount: 2-4
171241
- id: PLACEABLE
172242
- id: SELLABLE
173243
value: 8.0
@@ -302,21 +372,20 @@ items:
302372
- id: CUSTOM_DROP
303373
rules:
304374
- conditions:
305-
silk_touch: false
375+
smelting_touch: true
306376
drops:
307377
- item: GOLD_INGOT
308378
chance: 1.0
309-
amount: "2-5"
379+
amount: 1
310380
- conditions:
311-
silk_touch: true
312381
drops:
313382
- item: GOLD_ORE
314383
chance: 1.0
315384
amount: 1
316385
- id: PLACEABLE
317386
- id: SKILLABLE_MINE
318387
category: MINING
319-
mining_value: 5.0
388+
mining_value: 6.0
320389
- id: SELLABLE
321390
value: 4.0
322391
- id: GRAVEL
@@ -363,6 +432,19 @@ items:
363432
- id: IRON_ORE
364433
rarity: COMMON
365434
components:
435+
- id: CUSTOM_DROP
436+
rules:
437+
- conditions:
438+
smelting_touch: true
439+
drops:
440+
- item: IRON_INGOT
441+
chance: 1.0
442+
amount: 1
443+
- conditions:
444+
drops:
445+
- item: IRON_ORE
446+
chance: 1.0
447+
amount: 1
366448
- id: PLACEABLE
367449
- id: SKILLABLE_MINE
368450
category: MINING
@@ -429,9 +511,28 @@ items:
429511
- id: LAPIS_LAZULI
430512
rarity: COMMON
431513
components:
514+
- id: SELLABLE
515+
value: 1.0
516+
- id: LAPIS_LAZULI_ORE
517+
rarity: COMMON
518+
components:
519+
- id: CUSTOM_DROP
520+
rules:
521+
- conditions:
522+
silk_touch: true
523+
drops:
524+
- item: LAPIS_LAZULI_ORE
525+
chance: 1.0
526+
amount: 1
527+
- conditions:
528+
drops:
529+
- item: LAPIS_LAZULI
530+
chance: 1.0
531+
amount: 4-8
532+
- id: PLACEABLE
432533
- id: SKILLABLE_MINE
433534
category: MINING
434-
mining_value: 5.0
535+
mining_value: 7.0
435536
- id: SELLABLE
436537
value: 1.0
437538
- id: LAPIS_LAZULI_BLOCK
@@ -506,11 +607,30 @@ items:
506607
- id: QUARTZ
507608
rarity: COMMON
508609
components:
610+
- id: SELLABLE
611+
value: 4.0
612+
- id: NETHER_QUARTZ_ORE
613+
rarity: COMMON
614+
components:
615+
- id: CUSTOM_DROP
616+
rules:
617+
- conditions:
618+
silk_touch: true
619+
drops:
620+
- item: NETHER_QUARTZ_ORE
621+
chance: 1.0
622+
amount: 1
623+
- conditions:
624+
drops:
625+
- item: QUARTZ
626+
chance: 1.0
627+
amount: 1
628+
- id: PLACEABLE
509629
- id: SKILLABLE_MINE
510630
category: MINING
511631
mining_value: 5.0
512632
- id: SELLABLE
513-
value: 4.0
633+
value: 1.0
514634
- id: RED_SAND
515635
rarity: COMMON
516636
components:
@@ -523,12 +643,31 @@ items:
523643
- id: REDSTONE
524644
rarity: COMMON
525645
components:
646+
- id: SELLABLE
647+
value: 1.0
648+
- id: PLACEABLE
649+
- id: REDSTONE_ORE
650+
rarity: COMMON
651+
components:
652+
- id: CUSTOM_DROP
653+
rules:
654+
- conditions:
655+
silk_touch: true
656+
drops:
657+
- item: REDSTONE_ORE
658+
chance: 1.0
659+
amount: 1
660+
- conditions:
661+
drops:
662+
- item: REDSTONE
663+
chance: 1.0
664+
amount: 4-5
665+
- id: PLACEABLE
526666
- id: SKILLABLE_MINE
527667
category: MINING
528-
mining_value: 5.0
668+
mining_value: 7.0
529669
- id: SELLABLE
530670
value: 1.0
531-
- id: PLACEABLE
532671
- id: REDSTONE_BLOCK
533672
rarity: COMMON
534673
components:

0 commit comments

Comments
 (0)