diff options
46 files changed, 1418 insertions, 128 deletions
diff --git a/build.gradle b/build.gradle index 3336315..1148de2 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,6 @@ version = project.mod_version group = project.maven_group repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. - maven { url "https://maven.terraformersmc.com" } maven { url 'https://maven.nucleoid.xyz' } maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" } exclusiveContent { @@ -48,8 +42,7 @@ dependencies { modImplementation "maven.modrinth:Revelationary:1.1.0" modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.1.0") - - modApi("com.terraformersmc:modmenu:${"4.+"}")} +} processResources { inputs.property "version", project.version diff --git a/gradle.properties b/gradle.properties index 5fd0a03..81ca478 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.jvmargs=-Xmx2G # check these on https://fabricmc.net/develop minecraft_version=1.19.2 yarn_mappings=1.19.2+build.8 - loader_version=0.14.9 + loader_version=0.14.11 # Mod Properties mod_version = 0.0.1 maven_group = dev.mayaqq archives_base_name = youve-got-a-skill-issue - modid=ygasi + modid = ygasi # Dependencies - fabric_version=0.60.0+1.19.2 + fabric_version = 0.67.0+1.19.2 diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence1.json b/src/main/generated/data/minecraft/advancements/ygasi/defence1.json new file mode 100644 index 0000000..bdfcdc0 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/defence1.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:ygasi/mercenary", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/mercenary" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_defence1": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.mercenary.defence1.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:iron_chestplate", + "nbt": "{Damage:0}" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.mercenary.defence1.title" + } + }, + "requirements": [ + [ + "unlocked_defence1" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence2.json b/src/main/generated/data/minecraft/advancements/ygasi/defence2.json new file mode 100644 index 0000000..d6e66a0 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/defence2.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:ygasi/defence1", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/defence1" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_defence2": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.mercenary.defence2.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:iron_chestplate", + "nbt": "{Damage:0}" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.mercenary.defence2.title" + } + }, + "requirements": [ + [ + "unlocked_defence2" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence3.json b/src/main/generated/data/minecraft/advancements/ygasi/defence3.json new file mode 100644 index 0000000..5567889 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/defence3.json @@ -0,0 +1,41 @@ +{ + "parent": "minecraft:ygasi/defence2", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/defence2" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_defence3": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.mercenary.defence3.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:iron_chestplate", + "nbt": "{Damage:0}" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.mercenary.defence3.title" + } + }, + "requirements": [ + [ + "unlocked_defence3" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/druidry.json b/src/main/generated/data/minecraft/advancements/ygasi/druidry.json index 884cfed..fa73a5e 100644 --- a/src/main/generated/data/minecraft/advancements/ygasi/druidry.json +++ b/src/main/generated/data/minecraft/advancements/ygasi/druidry.json @@ -14,7 +14,7 @@ "display": { "announce_to_chat": false, "description": { - "text": "Unlock the druidry branch!" + "translate": "advancements.ygasi.druidry.description" }, "frame": "goal", "hidden": false, @@ -23,7 +23,7 @@ }, "show_toast": false, "title": { - "text": "Druidry" + "translate": "advancements.ygasi.druidry.title" } }, "requirements": [ diff --git a/src/main/generated/data/minecraft/advancements/ygasi/element1.json b/src/main/generated/data/minecraft/advancements/ygasi/element1.json new file mode 100644 index 0000000..199af31 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/element1.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/wizardry", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/wizardry" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_element1": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.element1.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:fire_charge" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.element1.title" + } + }, + "requirements": [ + [ + "unlocked_element1" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/element2.json b/src/main/generated/data/minecraft/advancements/ygasi/element2.json new file mode 100644 index 0000000..54e758f --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/element2.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/element1", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/element1" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_element2": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.element2.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:fire_charge" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.element2.title" + } + }, + "requirements": [ + [ + "unlocked_element2" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/element3.json b/src/main/generated/data/minecraft/advancements/ygasi/element3.json new file mode 100644 index 0000000..8bd713f --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/element3.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/element2", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/element2" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_element3": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.element3.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:fire_charge" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.element3.title" + } + }, + "requirements": [ + [ + "unlocked_element3" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/extra.json b/src/main/generated/data/minecraft/advancements/ygasi/extra.json new file mode 100644 index 0000000..c4ae6f2 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/extra.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/root", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/root" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_extra": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.extra.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "minecraft:emerald" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.extra.title" + } + }, + "requirements": [ + [ + "unlocked_extra" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/fight1.json b/src/main/generated/data/minecraft/advancements/ygasi/fight1.json new file mode 100644 index 0000000..08879a8 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/fight1.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/wizardry", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/wizardry" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_fight1": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.fight1.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:blaze_powder" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.fight1.title" + } + }, + "requirements": [ + [ + "unlocked_fight1" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/fight2.json b/src/main/generated/data/minecraft/advancements/ygasi/fight2.json new file mode 100644 index 0000000..ad7f6d8 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/fight2.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/fight1", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/fight1" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_fight2": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.fight2.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:blaze_powder" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.fight2.title" + } + }, + "requirements": [ + [ + "unlocked_fight2" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/fight3.json b/src/main/generated/data/minecraft/advancements/ygasi/fight3.json new file mode 100644 index 0000000..e8360a1 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/fight3.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/fight2", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/fight2" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_fight3": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.fight3.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:blaze_powder" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.fight3.title" + } + }, + "requirements": [ + [ + "unlocked_fight3" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/force1.json b/src/main/generated/data/minecraft/advancements/ygasi/force1.json new file mode 100644 index 0000000..5e88eff --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/force1.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/wizardry", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/wizardry" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_force1": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.force1.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:ender_pearl" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.force1.title" + } + }, + "requirements": [ + [ + "unlocked_force1" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/force2.json b/src/main/generated/data/minecraft/advancements/ygasi/force2.json new file mode 100644 index 0000000..e8bb729 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/force2.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/force1", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/force1" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_force2": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.force2.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:ender_pearl" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.force2.title" + } + }, + "requirements": [ + [ + "unlocked_force2" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/force3.json b/src/main/generated/data/minecraft/advancements/ygasi/force3.json new file mode 100644 index 0000000..f95f569 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/force3.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/force2", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/force2" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_force3": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.wizardry.force3.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:ender_pearl" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.wizardry.force3.title" + } + }, + "requirements": [ + [ + "unlocked_force3" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json b/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json index fcf77bc..85339ae 100644 --- a/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json +++ b/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json @@ -14,17 +14,17 @@ "display": { "announce_to_chat": false, "description": { - "text": "Unlock the mercenary branch!" + "translate": "advancements.ygasi.mercenary.description" }, "frame": "goal", "hidden": false, "icon": { - "item": "minecraft:iron_sword", + "item": "minecraft:diamond_sword", "nbt": "{Damage:0}" }, "show_toast": false, "title": { - "text": "Mercenary" + "translate": "advancements.ygasi.mercenary.title" } }, "requirements": [ diff --git a/src/main/generated/data/minecraft/advancements/ygasi/nature1.json b/src/main/generated/data/minecraft/advancements/ygasi/nature1.json new file mode 100644 index 0000000..46f1aa7 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/nature1.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/druidry", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/druidry" + }, + "trigger": "revelationary:advancement_gotten" + }, + "unlocked_nature1": { + "trigger": "minecraft:impossible" + } + }, + "display": { + "announce_to_chat": false, + "description": { + "translate": "advancements.ygasi.druidry.nature1.description" + }, + "frame": "task", + "hidden": true, + "icon": { + "item": "minecraft:grass_block" + }, + "show_toast": false, + "title": { + "translate": "advancements.ygasi.druidry.nature1.title" + } + }, + "requirements": [ + [ + "unlocked_nature1" + ], + [ + "gotten_previous" + ] + ], + "rewards": { + "experience": 1 + } +}
\ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancements/ygasi/nature2.json b/src/main/generated/data/minecraft/advancements/ygasi/nature2.json new file mode 100644 index 0000000..f70c0a3 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/ygasi/nature2.json @@ -0,0 +1,40 @@ +{ + "parent": "minecraft:ygasi/nature1", + "criteria": { + "gotten_previous": { + "conditions": { + "advancement_identifier": "minecraft:ygasi/nature1" + }, + "trigger": "revelationary:advancement_gotten" + }, + |