Skip to content

Commit fc35c1d

Browse files
PssbleTrnglePssbleTrngle
committed
advancements & updated electrum textures
1 parent d79ec51 commit fc35c1d

29 files changed

+508
-200
lines changed

‎src/generated/resources/assets/oreganized/lang/en_us.json

+22-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
{
2-
"advancements.adventure.mirror_mirror.description": "Obtain a Silver Mirror",
3-
"advancements.adventure.mirror_mirror.title": "Mirror, Mirror who is the fairest?",
4-
"advancements.story.disc_smith.description": "Submerge a broken music disc into molten lead",
5-
"advancements.story.disc_smith.title": "Disc Smith",
6-
"advancements.story.eat_with_lead.description": "Eat anything with lead in your hotbar",
7-
"advancements.story.eat_with_lead.title": "Like the Romans",
8-
"advancements.story.electrum_gear.description": "Obtain a full set of electrum armor",
9-
"advancements.story.electrum_gear.title": "Cover me in... Wings?",
10-
"advancements.story.melting_point.description": "Pick up Molten Lead from a cauldron",
11-
"advancements.story.melting_point.title": "Melting Point",
12-
"advancements.story.obtain_silver.description": "Smelt Raw Silver",
13-
"advancements.story.obtain_silver.title": "Every Stone has a Silver Lining",
2+
"advancements.oreganized.demoted.description": "Use lead bolts in a crossbow to strip a pillager of his Ominous Banner",
3+
"advancements.oreganized.demoted.title": "Demoted",
4+
"advancements.oreganized.disc_smith.description": "Submerge a broken music disc into molten lead",
5+
"advancements.oreganized.disc_smith.title": "Disc Smith",
6+
"advancements.oreganized.electrum_gear.description": "Obtain a full set of electrum armor",
7+
"advancements.oreganized.electrum_gear.title": "Cover me in... Wings?",
8+
"advancements.oreganized.garglin_water.description": "Provide Gargoyle with a source of water to spew even without rain",
9+
"advancements.oreganized.garglin_water.title": "Garglin' Water",
10+
"advancements.oreganized.groovy.description": "Use the scribe to make grooves on Ice!",
11+
"advancements.oreganized.groovy.title": "Groovy",
12+
"advancements.oreganized.like_the_romans.description": "Get Brain Damage from interacting with lead",
13+
"advancements.oreganized.like_the_romans.title": "Like the Romans",
14+
"advancements.oreganized.melting_point.description": "Pick up Molten Lead from a cauldron",
15+
"advancements.oreganized.melting_point.title": "Melting Point",
16+
"advancements.oreganized.mirror_mirror.description": "Obtain a Silver Mirror",
17+
"advancements.oreganized.mirror_mirror.title": "Mirror, Mirror who is the fairest?",
18+
"advancements.oreganized.obtain_silver.description": "Smelt Raw Silver",
19+
"advancements.oreganized.obtain_silver.title": "Every Stone has a Silver Lining",
20+
"advancements.oreganized.profound_brain_damage.description": "Let your health reach half a heart while having the Brain Damage effect",
21+
"advancements.oreganized.profound_brain_damage.title": "Profound Brain Damage",
22+
"advancements.oreganized.weeping_devil.description": "Exchange a Silver Ingot for a hellish growl of the Gargoyle",
23+
"advancements.oreganized.weeping_devil.title": "Weeping Devil",
1424
"attribute.oreganized.kinetic_damage": "Kinetic Damage",
1525
"block.oreganized.black_crystal_glass": "Black Crystal Glass",
1626
"block.oreganized.black_crystal_glass_pane": "Black Crystal Glass Pane",

‎src/generated/resources/data/oreganized/advancements/adventure/demoted.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"parent": "minecraft:adventure/whos_the_pillager_now",
3+
"criteria": {
4+
"see_gargoyle_gargle": {
5+
"conditions": {},
6+
"trigger": "oreganized:knocked_banner_off"
7+
}
8+
},
9+
"display": {
10+
"announce_to_chat": true,
11+
"description": {
12+
"translate": "advancements.oreganized.demoted.description"
13+
},
14+
"frame": "challenge",
15+
"hidden": false,
16+
"icon": {
17+
"item": "minecraft:crossbow",
18+
"nbt": "{Damage:0}"
19+
},
20+
"show_toast": true,
21+
"title": {
22+
"translate": "advancements.oreganized.demoted.title"
23+
}
24+
},
25+
"requirements": [
26+
[
27+
"see_gargoyle_gargle"
28+
]
29+
],
30+
"sends_telemetry_event": true
31+
}

‎src/generated/resources/data/oreganized/advancements/adventure/garglin_water.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"parent": "oreganized:adventure/weeping_devil",
3+
"criteria": {
4+
"see_gargoyle_gargle": {
5+
"conditions": {},
6+
"trigger": "oreganized:see_gargoyle_gargle"
7+
}
8+
},
9+
"display": {
10+
"announce_to_chat": true,
11+
"description": {
12+
"translate": "advancements.oreganized.garglin_water.description"
13+
},
14+
"frame": "task",
15+
"hidden": false,
16+
"icon": {
17+
"item": "minecraft:water_bucket"
18+
},
19+
"show_toast": true,
20+
"title": {
21+
"translate": "advancements.oreganized.garglin_water.title"
22+
}
23+
},
24+
"requirements": [
25+
[
26+
"see_gargoyle_gargle"
27+
]
28+
],
29+
"sends_telemetry_event": true
30+
}

‎src/generated/resources/data/oreganized/advancements/adventure/mirror_mirror.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"display": {
1818
"announce_to_chat": true,
1919
"description": {
20-
"translate": "advancements.adventure.mirror_mirror.description"
20+
"translate": "advancements.oreganized.mirror_mirror.description"
2121
},
2222
"frame": "task",
2323
"hidden": false,
@@ -26,7 +26,7 @@
2626
},
2727
"show_toast": true,
2828
"title": {
29-
"translate": "advancements.adventure.mirror_mirror.title"
29+
"translate": "advancements.oreganized.mirror_mirror.title"
3030
}
3131
},
3232
"requirements": [

‎src/generated/resources/data/oreganized/advancements/adventure/weeping_devil.json

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"parent": "minecraft:adventure/root",
3+
"criteria": {
4+
"activated_gargoyle": {
5+
"conditions": {
6+
"location": [
7+
{
8+
"condition": "minecraft:location_check",
9+
"predicate": {
10+
"block": {
11+
"blocks": [
12+
"oreganized:gargoyle"
13+
]
14+
}
15+
}
16+
},
17+
{
18+
"condition": "minecraft:match_tool",
19+
"predicate": {
20+
"tag": "forge:ingots/silver"
21+
}
22+
}
23+
]
24+
},
25+
"trigger": "minecraft:item_used_on_block"
26+
}
27+
},
28+
"display": {
29+
"announce_to_chat": true,
30+
"description": {
31+
"translate": "advancements.oreganized.weeping_devil.description"
32+
},
33+
"frame": "task",
34+
"hidden": false,
35+
"icon": {
36+
"item": "oreganized:gargoyle"
37+
},
38+
"show_toast": true,
39+
"title": {
40+
"translate": "advancements.oreganized.weeping_devil.title"
41+
}
42+
},
43+
"requirements": [
44+
[
45+
"activated_gargoyle"
46+
]
47+
],
48+
"sends_telemetry_event": true
49+
}

‎src/generated/resources/data/oreganized/advancements/husbandry/groovy.json

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"parent": "minecraft:husbandry/root",
3+
"criteria": {
4+
"use_scribe_on_ice": {
5+
"conditions": {
6+
"location": [
7+
{
8+
"condition": "minecraft:location_check",
9+
"predicate": {
10+
"block": {
11+
"tag": "minecraft:ice"
12+
}
13+
}
14+
},
15+
{
16+
"condition": "minecraft:match_tool",
17+
"predicate": {
18+
"items": [
19+
"oreganized:scribe"
20+
]
21+
}
22+
}
23+
]
24+
},
25+
"trigger": "minecraft:item_used_on_block"
26+
}
27+
},
28+
"display": {
29+
"announce_to_chat": true,
30+
"description": {
31+
"translate": "advancements.oreganized.groovy.description"
32+
},
33+
"frame": "task",
34+
"hidden": false,
35+
"icon": {
36+
"item": "oreganized:grooved_ice"
37+
},
38+
"show_toast": true,
39+
"title": {
40+
"translate": "advancements.oreganized.groovy.title"
41+
}
42+
},
43+
"requirements": [
44+
[
45+
"use_scribe_on_ice"
46+
]
47+
],
48+
"sends_telemetry_event": true
49+
}

‎src/generated/resources/data/oreganized/advancements/story/disc_smith.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"display": {
1818
"announce_to_chat": true,
1919
"description": {
20-
"translate": "advancements.story.disc_smith.description"
20+
"translate": "advancements.oreganized.disc_smith.description"
2121
},
2222
"frame": "task",
2323
"hidden": false,
@@ -26,7 +26,7 @@
2626
},
2727
"show_toast": true,
2828
"title": {
29-
"translate": "advancements.story.disc_smith.title"
29+
"translate": "advancements.oreganized.disc_smith.title"
3030
}
3131
},
3232
"requirements": [

‎src/generated/resources/data/oreganized/advancements/story/electrum_gear.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"display": {
3333
"announce_to_chat": true,
3434
"description": {
35-
"translate": "advancements.story.electrum_gear.description"
35+
"translate": "advancements.oreganized.electrum_gear.description"
3636
},
3737
"frame": "challenge",
3838
"hidden": false,
@@ -42,7 +42,7 @@
4242
},
4343
"show_toast": true,
4444
"title": {
45-
"translate": "advancements.story.electrum_gear.title"
45+
"translate": "advancements.oreganized.electrum_gear.title"
4646
}
4747
},
4848
"requirements": [

‎src/generated/resources/data/oreganized/advancements/story/eat_with_lead.json ‎src/generated/resources/data/oreganized/advancements/story/like_the_romans.json

+4-24
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
{
22
"parent": "minecraft:story/upgrade_tools",
33
"criteria": {
4-
"eaten": {
5-
"conditions": {},
6-
"trigger": "minecraft:consume_item"
7-
},
8-
"has_lead": {
9-
"conditions": {
10-
"items": [
11-
{
12-
"tag": "forge:ingots/lead"
13-
}
14-
]
15-
},
16-
"trigger": "minecraft:inventory_changed"
17-
},
18-
"stunned": {
4+
"has_brain_damage": {
195
"conditions": {
206
"effects": {
217
"oreganized:stunning": {}
@@ -27,7 +13,7 @@
2713
"display": {
2814
"announce_to_chat": true,
2915
"description": {
30-
"translate": "advancements.story.eat_with_lead.description"
16+
"translate": "advancements.oreganized.like_the_romans.description"
3117
},
3218
"frame": "task",
3319
"hidden": false,
@@ -36,18 +22,12 @@
3622
},
3723
"show_toast": true,
3824
"title": {
39-
"translate": "advancements.story.eat_with_lead.title"
25+
"translate": "advancements.oreganized.like_the_romans.title"
4026
}
4127
},
4228
"requirements": [
4329
[
44-
"stunned"
45-
],
46-
[
47-
"has_lead"
48-
],
49-
[
50-
"eaten"
30+
"has_brain_damage"
5131
]
5232
],
5333
"sends_telemetry_event": true

‎src/generated/resources/data/oreganized/advancements/story/melting_point.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"display": {
1818
"announce_to_chat": true,
1919
"description": {
20-
"translate": "advancements.story.melting_point.description"
20+
"translate": "advancements.oreganized.melting_point.description"
2121
},
2222
"frame": "task",
2323
"hidden": false,
@@ -26,7 +26,7 @@
2626
},
2727
"show_toast": true,
2828
"title": {
29-
"translate": "advancements.story.melting_point.title"
29+
"translate": "advancements.oreganized.melting_point.title"
3030
}
3131
},
3232
"requirements": [

‎src/generated/resources/data/oreganized/advancements/story/obtain_silver.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"display": {
1616
"announce_to_chat": true,
1717
"description": {
18-
"translate": "advancements.story.obtain_silver.description"
18+
"translate": "advancements.oreganized.obtain_silver.description"
1919
},
2020
"frame": "task",
2121
"hidden": false,
@@ -24,7 +24,7 @@
2424
},
2525
"show_toast": true,
2626
"title": {
27-
"translate": "advancements.story.obtain_silver.title"
27+
"translate": "advancements.oreganized.obtain_silver.title"
2828
}
2929
},
3030
"requirements": [

‎src/generated/resources/data/oreganized/advancements/story/profound_brain_damage.json

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"parent": "oreganized:story/like_the_romans",
3+
"criteria": {
4+
"stunned": {
5+
"conditions": {
6+
"effects": {
7+
"oreganized:stunning": {
8+
"amplifier": {
9+
"max": 4
10+
}
11+
}
12+
}
13+
},
14+
"trigger": "minecraft:effects_changed"
15+
}
16+
},
17+
"display": {
18+
"announce_to_chat": true,
19+
"description": {
20+
"translate": "advancements.oreganized.profound_brain_damage.description"
21+
},
22+
"frame": "task",
23+
"hidden": false,
24+
"icon": {
25+
"item": "oreganized:molten_lead_bucket"
26+
},
27+
"show_toast": true,
28+
"title": {
29+
"translate": "advancements.oreganized.profound_brain_damage.title"
30+
}
31+
},
32+
"requirements": [
33+
[
34+
"stunned"
35+
]
36+
],
37+
"sends_telemetry_event": true
38+
}

0 commit comments

Comments
 (0)