Skip to content

Commit 060410a

Browse files
committed
Add aliases needed by EvtClick. Fix a ton of bugs on 1.13.
1 parent ddc6f9b commit 060410a

File tree

6 files changed

+190
-173
lines changed

6 files changed

+190
-173
lines changed

brewing.sk

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,100 @@
11
potions:
2-
[(glass|empty)] bottle¦s = minecraft:glass_bottle
3-
water bottle¦s = minecraft:potion {"Potion": "minecraft:water"}
2+
[(glass|empty)] bottle¦s = minecraft:glass_bottle
3+
water bottle¦s = minecraft:potion {"Potion": "minecraft:water"}
44

5-
{potion types}:
6-
water = - {"Potion": "minecraft:water"}
7-
thick = - {"Potion": "minecraft:thick"}
8-
mundane = - {"Potion": "minecraft:mundane"}
9-
awkward = - {"Potion": "minecraft:awkward"}
5+
{potion types}:
6+
{default} = - # Match all potions
7+
water = - {"Potion": "minecraft:water"}
8+
thick = - {"Potion": "minecraft:thick"}
9+
mundane = - {"Potion": "minecraft:mundane"}
10+
awkward = - {"Potion": "minecraft:awkward"}
1011

11-
night vision = - {"Potion": "minecraft:night_vision"}
12-
(extended|long) night vision = - {"Potion": "minecraft:long_night_vision"}
12+
night vision = - {"Potion": "minecraft:night_vision"}
13+
(extended|long) night vision = - {"Potion": "minecraft:long_night_vision"}
1314

14-
invisibility = - {"Potion": "minecraft:invisibility"}
15-
(extended|long) invisibility = - {"Potion": "minecraft:long_invisibility"}
15+
invisibility = - {"Potion": "minecraft:invisibility"}
16+
(extended|long) invisibility = - {"Potion": "minecraft:long_invisibility"}
1617

17-
(leaping|jumping) = - {"Potion": "minecraft:leaping"}
18-
(extended|long) (leaping|jumping) = - {"Potion": "minecraft:long_leaping"}
19-
(strong|upgraded|level 2) (leaping|jumping) = - {"Potion": "minecraft:strong_leaping"}
18+
(leaping|jumping) = - {"Potion": "minecraft:leaping"}
19+
(extended|long) (leaping|jumping) = - {"Potion": "minecraft:long_leaping"}
20+
(strong|upgraded|level 2) (leaping|jumping) = - {"Potion": "minecraft:strong_leaping"}
2021

21-
fire resistance = - {"Potion": "minecraft:fire_resistance"}
22-
(extended|long) fire resistance = - {"Potion": "minecraft:long_fire_resistance"}
22+
fire resistance = - {"Potion": "minecraft:fire_resistance"}
23+
(extended|long) fire resistance = - {"Potion": "minecraft:long_fire_resistance"}
2324

24-
(speed|swiftness) = - {"Potion": "minecraft:swiftness"}
25-
(extended|long) (speed|swiftness) = - {"Potion": "minecraft:long_swiftness"}
26-
(strong|upgraded|level 2) (speed|swiftness) = - {"Potion": "minecraft:strong_swiftness"}
25+
(speed|swiftness) = - {"Potion": "minecraft:swiftness"}
26+
(extended|long) (speed|swiftness) = - {"Potion": "minecraft:long_swiftness"}
27+
(strong|upgraded|level 2) (speed|swiftness) = - {"Potion": "minecraft:strong_swiftness"}
2728

28-
slow[ness] = - {"Potion": "minecraft:slowness"}
29-
(extended|long) slow[ness] = - {"Potion": "minecraft:long_slowness"}
30-
(strong|upgraded|level 2) slow[ness] = - {"Potion": "minecraft:strong_slowness"}
29+
slow[ness] = - {"Potion": "minecraft:slowness"}
30+
(extended|long) slow[ness] = - {"Potion": "minecraft:long_slowness"}
31+
(strong|upgraded|level 2) slow[ness] = - {"Potion": "minecraft:strong_slowness"}
3132

32-
turtle master = - {"Potion": "minecraft:turtle_master"}
33-
(extended|long) turtle master = - {"Potion": "minecraft:long_turtle_master"}
34-
(strong|upgraded|level 2) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
33+
turtle master = - {"Potion": "minecraft:turtle_master"}
34+
(extended|long) turtle master = - {"Potion": "minecraft:long_turtle_master"}
35+
(strong|upgraded|level 2) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
3536

36-
water breathing = - {"Potion": "minecraft:water_breathing"}
37-
(extended|long) water breathing = - {"Potion": "minecraft:long_water_breathing"}
37+
water breathing = - {"Potion": "minecraft:water_breathing"}
38+
(extended|long) water breathing = - {"Potion": "minecraft:long_water_breathing"}
3839

39-
heal(th|ing) = - {"Potion": "minecraft:healing"}
40-
(strong|upgraded|level 2) heal(th|ing) = - {"Potion": "minecraft:strong_healing"}
40+
heal(th|ing) = - {"Potion": "minecraft:healing"}
41+
(strong|upgraded|level 2) heal(th|ing) = - {"Potion": "minecraft:strong_healing"}
4142

42-
harming = - {"Potion": "minecraft:harming"}
43-
(strong|upgraded|level 2) harming = - {"Potion": "minecraft:strong_harming"}
43+
harming = - {"Potion": "minecraft:harming"}
44+
(strong|upgraded|level 2) harming = - {"Potion": "minecraft:strong_harming"}
4445

45-
poison[ing] = - {"Potion": "minecraft:poison"}
46-
(extended|long) poison[ing] = - {"Potion": "minecraft:long_poison"}
47-
(strong|upgraded|level 2) poison[ing] = - {"Potion": "minecraft:strong_poison"}
46+
poison[ing] = - {"Potion": "minecraft:poison"}
47+
(extended|long) poison[ing] = - {"Potion": "minecraft:long_poison"}
48+
(strong|upgraded|level 2) poison[ing] = - {"Potion": "minecraft:strong_poison"}
4849

49-
regen[eration] = - {"Potion": "minecraft:regeneration"}
50-
(extended|long) regen[eration] = - {"Potion": "minecraft:long_regeneration"}
51-
(strong|upgraded|level 2) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
50+
regen[eration] = - {"Potion": "minecraft:regeneration"}
51+
(extended|long) regen[eration] = - {"Potion": "minecraft:long_regeneration"}
52+
(strong|upgraded|level 2) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
5253

53-
strength = - {"Potion": "minecraft:strength"}
54-
(extended|long) strength = - {"Potion": "minecraft:long_strength"}
55-
(strong|upgraded|level 2) strength = - {"Potion": "minecraft:strong_strength"}
54+
strength = - {"Potion": "minecraft:strength"}
55+
(extended|long) strength = - {"Potion": "minecraft:long_strength"}
56+
(strong|upgraded|level 2) strength = - {"Potion": "minecraft:strong_strength"}
5657

57-
weak(ness|ening) = - {"Potion": "minecraft:weakness"}
58-
(extended|long) weak(ness|ening) = - {"Potion": "minecraft:long_weakness"}
58+
weak(ness|ening) = - {"Potion": "minecraft:weakness"}
59+
(extended|long) weak(ness|ening) = - {"Potion": "minecraft:long_weakness"}
5960

60-
slow fall[ing] = - {"Potion": "minecraft:slow_falling"}
61-
(extended|long) slow fall[ing] = - {"Potion": "minecraft:long_slow_falling"}
61+
slow fall[ing] = - {"Potion": "minecraft:slow_falling"}
62+
(extended|long) slow fall[ing] = - {"Potion": "minecraft:long_slow_falling"}
6263

63-
(potion[s] of {potion types}|{potion types} potion¦s) = minecraft:potion
64-
(splash potion[s] of {potion types}|{potion types} splash potion¦s) = minecraft:splash_potion
65-
(splash potion[s] of {potion types}|{potion types} lingering potion¦s) = minecraft:lingering_potion
64+
(potion[s] of {potion types}|{potion types} potion¦s) = minecraft:potion
65+
(splash potion[s] of {potion types}|{potion types} splash potion¦s) = minecraft:splash_potion
66+
(splash potion[s] of {potion types}|{potion types} lingering potion¦s) = minecraft:lingering_potion
6667

6768
blocks:
68-
brewing stand¦s = minecraft:brewing_stand
69-
cauldron¦s = minecraft:cauldron
69+
brewing stand¦s = minecraft:brewing_stand
70+
cauldron¦s = minecraft:cauldron
7071

7172
combat update brewing:
72-
minecraft version = 1.9 or newer
73-
dragon['s] breath = minecraft:dragon_breath
73+
minecraft version = 1.9 or newer
74+
dragon['s] breath = minecraft:dragon_breath
7475

75-
{combat update potions}:
76-
luck = - {"Potion": "minecraft:luck"}
76+
{combat update potions}:
77+
luck = - {"Potion": "minecraft:luck"}
7778

78-
(potion[s] of {combat update potions}|{combat update potions} potion¦s) = minecraft:potion
79-
(splash potion[s] of {combat update potions}|{combat update potions} splash potion¦s) = minecraft:splash_potion
80-
(splash potion[s] of {combat update potions}|{combat update potions} lingering potion¦s) = minecraft:lingering_potion
79+
(potion[s] of {combat update potions}|{combat update potions} potion¦s) = minecraft:potion
80+
(splash potion[s] of {combat update potions}|{combat update potions} splash potion¦s) = minecraft:splash_potion
81+
(splash potion[s] of {combat update potions}|{combat update potions} lingering potion¦s) = minecraft:lingering_potion
8182

8283
unchanged ingredients:
83-
ghast tear¦s = minecraft:ghast_tear
84-
fermented spider eye¦s = minecraft:fermented_spider_eye
85-
blaze powder¦s = minecraft:blaze_powder
86-
magma cream¦s = minecraft:magma_cream
87-
gold[en] carrot¦s = minecraft:golden_carrot
88-
rabbit['s] (foot|feet) = minecraft:rabbit_foot
84+
ghast tear¦s = minecraft:ghast_tear
85+
fermented spider eye¦s = minecraft:fermented_spider_eye
86+
blaze powder¦s = minecraft:blaze_powder
87+
magma cream¦s = minecraft:magma_cream
88+
gold[en] carrot¦s = minecraft:golden_carrot
89+
rabbit['s] (foot|feet) = minecraft:rabbit_foot
8990

9091
ingredients before flattening:
91-
minecraft version = 1.12.2 or older
92-
(glistering|gold[en]) melon[ slice]¦s = minecraft:speckled_melon
92+
minecraft version = 1.12.2 or older
93+
(glistering|gold[en]) melon[ slice]¦s = minecraft:speckled_melon
9394

9495
ingredients after flattening:
95-
(glistering|gold[en]) melon[ slice]¦s = minecraft:glistering_melon_slice
96+
(glistering|gold[en]) melon[ slice]¦s = minecraft:glistering_melon_slice
9697

9798
update aquatic ingredients:
98-
minecraft version = 1.13 or newer
99-
phantom membrane¦s = minecraft:phantom_membrane
99+
minecraft version = 1.13 or newer
100+
phantom membrane¦s = minecraft:phantom_membrane

0 commit comments

Comments
 (0)