Skip to content

Commit

Permalink
advancements & updated electrum textures
Browse files Browse the repository at this point in the history
  • Loading branch information
PssbleTrngle committed Sep 20, 2024
1 parent d79ec51 commit fc35c1d
Show file tree
Hide file tree
Showing 29 changed files with 508 additions and 200 deletions.
34 changes: 22 additions & 12 deletions src/generated/resources/assets/oreganized/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
{
"advancements.adventure.mirror_mirror.description": "Obtain a Silver Mirror",
"advancements.adventure.mirror_mirror.title": "Mirror, Mirror who is the fairest?",
"advancements.story.disc_smith.description": "Submerge a broken music disc into molten lead",
"advancements.story.disc_smith.title": "Disc Smith",
"advancements.story.eat_with_lead.description": "Eat anything with lead in your hotbar",
"advancements.story.eat_with_lead.title": "Like the Romans",
"advancements.story.electrum_gear.description": "Obtain a full set of electrum armor",
"advancements.story.electrum_gear.title": "Cover me in... Wings?",
"advancements.story.melting_point.description": "Pick up Molten Lead from a cauldron",
"advancements.story.melting_point.title": "Melting Point",
"advancements.story.obtain_silver.description": "Smelt Raw Silver",
"advancements.story.obtain_silver.title": "Every Stone has a Silver Lining",
"advancements.oreganized.demoted.description": "Use lead bolts in a crossbow to strip a pillager of his Ominous Banner",
"advancements.oreganized.demoted.title": "Demoted",
"advancements.oreganized.disc_smith.description": "Submerge a broken music disc into molten lead",
"advancements.oreganized.disc_smith.title": "Disc Smith",
"advancements.oreganized.electrum_gear.description": "Obtain a full set of electrum armor",
"advancements.oreganized.electrum_gear.title": "Cover me in... Wings?",
"advancements.oreganized.garglin_water.description": "Provide Gargoyle with a source of water to spew even without rain",
"advancements.oreganized.garglin_water.title": "Garglin' Water",
"advancements.oreganized.groovy.description": "Use the scribe to make grooves on Ice!",
"advancements.oreganized.groovy.title": "Groovy",
"advancements.oreganized.like_the_romans.description": "Get Brain Damage from interacting with lead",
"advancements.oreganized.like_the_romans.title": "Like the Romans",
"advancements.oreganized.melting_point.description": "Pick up Molten Lead from a cauldron",
"advancements.oreganized.melting_point.title": "Melting Point",
"advancements.oreganized.mirror_mirror.description": "Obtain a Silver Mirror",
"advancements.oreganized.mirror_mirror.title": "Mirror, Mirror who is the fairest?",
"advancements.oreganized.obtain_silver.description": "Smelt Raw Silver",
"advancements.oreganized.obtain_silver.title": "Every Stone has a Silver Lining",
"advancements.oreganized.profound_brain_damage.description": "Let your health reach half a heart while having the Brain Damage effect",
"advancements.oreganized.profound_brain_damage.title": "Profound Brain Damage",
"advancements.oreganized.weeping_devil.description": "Exchange a Silver Ingot for a hellish growl of the Gargoyle",
"advancements.oreganized.weeping_devil.title": "Weeping Devil",
"attribute.oreganized.kinetic_damage": "Kinetic Damage",
"block.oreganized.black_crystal_glass": "Black Crystal Glass",
"block.oreganized.black_crystal_glass_pane": "Black Crystal Glass Pane",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parent": "minecraft:adventure/whos_the_pillager_now",
"criteria": {
"see_gargoyle_gargle": {
"conditions": {},
"trigger": "oreganized:knocked_banner_off"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.oreganized.demoted.description"
},
"frame": "challenge",
"hidden": false,
"icon": {
"item": "minecraft:crossbow",
"nbt": "{Damage:0}"
},
"show_toast": true,
"title": {
"translate": "advancements.oreganized.demoted.title"
}
},
"requirements": [
[
"see_gargoyle_gargle"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parent": "oreganized:adventure/weeping_devil",
"criteria": {
"see_gargoyle_gargle": {
"conditions": {},
"trigger": "oreganized:see_gargoyle_gargle"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.oreganized.garglin_water.description"
},
"frame": "task",
"hidden": false,
"icon": {
"item": "minecraft:water_bucket"
},
"show_toast": true,
"title": {
"translate": "advancements.oreganized.garglin_water.title"
}
},
"requirements": [
[
"see_gargoyle_gargle"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.adventure.mirror_mirror.description"
"translate": "advancements.oreganized.mirror_mirror.description"
},
"frame": "task",
"hidden": false,
Expand All @@ -26,7 +26,7 @@
},
"show_toast": true,
"title": {
"translate": "advancements.adventure.mirror_mirror.title"
"translate": "advancements.oreganized.mirror_mirror.title"
}
},
"requirements": [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parent": "minecraft:adventure/root",
"criteria": {
"activated_gargoyle": {
"conditions": {
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"blocks": [
"oreganized:gargoyle"
]
}
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "forge:ingots/silver"
}
}
]
},
"trigger": "minecraft:item_used_on_block"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.oreganized.weeping_devil.description"
},
"frame": "task",
"hidden": false,
"icon": {
"item": "oreganized:gargoyle"
},
"show_toast": true,
"title": {
"translate": "advancements.oreganized.weeping_devil.title"
}
},
"requirements": [
[
"activated_gargoyle"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parent": "minecraft:husbandry/root",
"criteria": {
"use_scribe_on_ice": {
"conditions": {
"location": [
{
"condition": "minecraft:location_check",
"predicate": {
"block": {
"tag": "minecraft:ice"
}
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"oreganized:scribe"
]
}
}
]
},
"trigger": "minecraft:item_used_on_block"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.oreganized.groovy.description"
},
"frame": "task",
"hidden": false,
"icon": {
"item": "oreganized:grooved_ice"
},
"show_toast": true,
"title": {
"translate": "advancements.oreganized.groovy.title"
}
},
"requirements": [
[
"use_scribe_on_ice"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.story.disc_smith.description"
"translate": "advancements.oreganized.disc_smith.description"
},
"frame": "task",
"hidden": false,
Expand All @@ -26,7 +26,7 @@
},
"show_toast": true,
"title": {
"translate": "advancements.story.disc_smith.title"
"translate": "advancements.oreganized.disc_smith.title"
}
},
"requirements": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.story.electrum_gear.description"
"translate": "advancements.oreganized.electrum_gear.description"
},
"frame": "challenge",
"hidden": false,
Expand All @@ -42,7 +42,7 @@
},
"show_toast": true,
"title": {
"translate": "advancements.story.electrum_gear.title"
"translate": "advancements.oreganized.electrum_gear.title"
}
},
"requirements": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
{
"parent": "minecraft:story/upgrade_tools",
"criteria": {
"eaten": {
"conditions": {},
"trigger": "minecraft:consume_item"
},
"has_lead": {
"conditions": {
"items": [
{
"tag": "forge:ingots/lead"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"stunned": {
"has_brain_damage": {
"conditions": {
"effects": {
"oreganized:stunning": {}
Expand All @@ -27,7 +13,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.story.eat_with_lead.description"
"translate": "advancements.oreganized.like_the_romans.description"
},
"frame": "task",
"hidden": false,
Expand All @@ -36,18 +22,12 @@
},
"show_toast": true,
"title": {
"translate": "advancements.story.eat_with_lead.title"
"translate": "advancements.oreganized.like_the_romans.title"
}
},
"requirements": [
[
"stunned"
],
[
"has_lead"
],
[
"eaten"
"has_brain_damage"
]
],
"sends_telemetry_event": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.story.melting_point.description"
"translate": "advancements.oreganized.melting_point.description"
},
"frame": "task",
"hidden": false,
Expand All @@ -26,7 +26,7 @@
},
"show_toast": true,
"title": {
"translate": "advancements.story.melting_point.title"
"translate": "advancements.oreganized.melting_point.title"
}
},
"requirements": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.story.obtain_silver.description"
"translate": "advancements.oreganized.obtain_silver.description"
},
"frame": "task",
"hidden": false,
Expand All @@ -24,7 +24,7 @@
},
"show_toast": true,
"title": {
"translate": "advancements.story.obtain_silver.title"
"translate": "advancements.oreganized.obtain_silver.title"
}
},
"requirements": [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"parent": "oreganized:story/like_the_romans",
"criteria": {
"stunned": {
"conditions": {
"effects": {
"oreganized:stunning": {
"amplifier": {
"max": 4
}
}
}
},
"trigger": "minecraft:effects_changed"
}
},
"display": {
"announce_to_chat": true,
"description": {
"translate": "advancements.oreganized.profound_brain_damage.description"
},
"frame": "task",
"hidden": false,
"icon": {
"item": "oreganized:molten_lead_bucket"
},
"show_toast": true,
"title": {
"translate": "advancements.oreganized.profound_brain_damage.title"
}
},
"requirements": [
[
"stunned"
]
],
"sends_telemetry_event": true
}
Loading

0 comments on commit fc35c1d

Please sign in to comment.