diff --git a/CHANGELOG.md b/CHANGELOG.md index 141f1e4..78a01e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Changelog +**1.0.1** +* Update Advancements + **1.0** * Initial Release diff --git a/gradle.properties b/gradle.properties index d3b764f..9d4351f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G fabric_loader_version = 0.7.9+build.190 # Mod Properties - mod_version = 1.0.0 + mod_version = 1.0.1 maven_group = com.thebrokenrail archives_base_name = reliccraft diff --git a/src/main/java/com/thebrokenrail/reliccraft/RelicCraft.java b/src/main/java/com/thebrokenrail/reliccraft/RelicCraft.java index c4b151e..1665d5e 100644 --- a/src/main/java/com/thebrokenrail/reliccraft/RelicCraft.java +++ b/src/main/java/com/thebrokenrail/reliccraft/RelicCraft.java @@ -166,6 +166,8 @@ public class RelicCraft implements ModInitializer { //noinspection ResultOfMethodCallIgnored TagRegistry.item(new Identifier(NAMESPACE, "relics")); + //noinspection ResultOfMethodCallIgnored + TagRegistry.item(new Identifier(NAMESPACE, "items")); TIME_TEMPLE_STRUCTURE_PIECE = Registry.register(Registry.STRUCTURE_PIECE, new Identifier(NAMESPACE, "time_temple"), TimeTempleGenerator.Piece::new); TIME_TEMPLE_STRUCTURE_FEATURE = Registry.register(Registry.FEATURE, new Identifier(NAMESPACE, "time_temple"), new TimeTempleFeature(DefaultFeatureConfig::deserialize)); diff --git a/src/main/resources/assets/reliccraft/lang/en_us.json b/src/main/resources/assets/reliccraft/lang/en_us.json index f3c044a..23fd1cb 100644 --- a/src/main/resources/assets/reliccraft/lang/en_us.json +++ b/src/main/resources/assets/reliccraft/lang/en_us.json @@ -53,10 +53,16 @@ "advancements.reliccraft.root.description": "Explore Ancient Relics and Magic!", "advancements.reliccraft.activate_teleportation_restrictor.title": "Teleportation Ban", "advancements.reliccraft.activate_teleportation_restrictor.description": "Activate a Teleportation Restrictor with a Dragon Egg", - "advancements.reliccraft.activate_teleportation_beacon.title": "Teleportation Master", - "advancements.reliccraft.activate_teleportation_beacon.description": "Activate a Teleportation Beacon with a Dragon Egg, then create a Targeted Ender Pearl by using an Ender Pearl on it, and then finally use the Targeted Ender Pearl", + "advancements.reliccraft.activate_teleportation_beacon.title": "Teleportation Hobbyist", + "advancements.reliccraft.activate_teleportation_beacon.description": "Activate a Teleportation Beacon with a Dragon Egg", + "advancements.reliccraft.use_teleportation_beacon.title": "Teleportation Expert", + "advancements.reliccraft.use_teleportation_beacon.description": "Interact with a Teleportation Beacon using an Ender Pearl", + "advancements.reliccraft.use_targeted_ender_pearl.title": "Teleportation Master", + "advancements.reliccraft.use_targeted_ender_pearl.description": "Use a Targeted Ender Pearl", "advancements.reliccraft.reveal_relic.title": "Master Archaeologist", "advancements.reliccraft.reveal_relic.description": "Combine a Relic with a Nether Star", + "advancements.reliccraft.discover_relic.title": "Junior Archaeologist", + "advancements.reliccraft.discover_relic.description": "Discover a Magical Relic", "advancements.reliccraft.dilate_time.title": "Time Master", "advancements.reliccraft.dilate_time.description": "Use a Time Dilater", "advancements.reliccraft.duplicate_time_dilater.title": "Time Lord", diff --git a/src/main/resources/data/reliccraft/advancements/activate_teleportation_beacon.json b/src/main/resources/data/reliccraft/advancements/activate_teleportation_beacon.json index 463edb6..063aa99 100644 --- a/src/main/resources/data/reliccraft/advancements/activate_teleportation_beacon.json +++ b/src/main/resources/data/reliccraft/advancements/activate_teleportation_beacon.json @@ -11,7 +11,7 @@ "description": { "translate": "advancements.reliccraft.activate_teleportation_beacon.description" }, - "frame": "challenge", + "frame": "task", "show_toast": true, "announce_to_chat": true, "hidden": false @@ -19,15 +19,6 @@ "criteria": { "activate": { "trigger": "reliccraft:activate_teleportation_beacon" - }, - "create_pearl": { - "trigger": "reliccraft:use_teleportation_beacon" - }, - "use_pearl": { - "trigger": "reliccraft:use_targeted_ender_pearl" } - }, - "rewards": { - "experience": 100 } } \ No newline at end of file diff --git a/src/main/resources/data/reliccraft/advancements/discover_relic.json b/src/main/resources/data/reliccraft/advancements/discover_relic.json new file mode 100644 index 0000000..315c750 --- /dev/null +++ b/src/main/resources/data/reliccraft/advancements/discover_relic.json @@ -0,0 +1,30 @@ +{ + "parent": "reliccraft:root", + "display": { + "icon": { + "item": "minecraft:chest" + }, + "title": { + "translate": "advancements.reliccraft.discover_relic.title" + }, + "description": { + "translate": "advancements.reliccraft.discover_relic.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "discover_relic": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "reliccraft:relics" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/reliccraft/advancements/reveal_relic.json b/src/main/resources/data/reliccraft/advancements/reveal_relic.json index 7aa955a..27e435a 100644 --- a/src/main/resources/data/reliccraft/advancements/reveal_relic.json +++ b/src/main/resources/data/reliccraft/advancements/reveal_relic.json @@ -1,5 +1,5 @@ { - "parent": "reliccraft:root", + "parent": "reliccraft:discover_relic", "display": { "icon": { "item": "minecraft:nether_star" diff --git a/src/main/resources/data/reliccraft/advancements/root.json b/src/main/resources/data/reliccraft/advancements/root.json index dc2cd2b..937ff87 100644 --- a/src/main/resources/data/reliccraft/advancements/root.json +++ b/src/main/resources/data/reliccraft/advancements/root.json @@ -16,12 +16,12 @@ "background": "minecraft:textures/gui/advancements/backgrounds/stone.png" }, "criteria": { - "obtain_relic": { + "discover_relic": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "tag": "reliccraft:relics" + "tag": "reliccraft:items" } ] } diff --git a/src/main/resources/data/reliccraft/advancements/use_targeted_ender_pearl.json b/src/main/resources/data/reliccraft/advancements/use_targeted_ender_pearl.json new file mode 100644 index 0000000..db8efa9 --- /dev/null +++ b/src/main/resources/data/reliccraft/advancements/use_targeted_ender_pearl.json @@ -0,0 +1,27 @@ +{ + "parent": "reliccraft:use_teleportation_beacon", + "display": { + "icon": { + "item": "reliccraft:teleportation_beacon", + "nbt": "{CustomModelData: 1}" + }, + "title": { + "translate": "advancements.reliccraft.use_targeted_ender_pearl.title" + }, + "description": { + "translate": "advancements.reliccraft.use_targeted_ender_pearl.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "use_pearl": { + "trigger": "reliccraft:use_targeted_ender_pearl" + } + }, + "rewards": { + "experience": 100 + } +} \ No newline at end of file diff --git a/src/main/resources/data/reliccraft/advancements/use_teleportation_beacon.json b/src/main/resources/data/reliccraft/advancements/use_teleportation_beacon.json new file mode 100644 index 0000000..8bdede1 --- /dev/null +++ b/src/main/resources/data/reliccraft/advancements/use_teleportation_beacon.json @@ -0,0 +1,23 @@ +{ + "parent": "reliccraft:activate_teleportation_beacon", + "display": { + "icon": { + "item": "reliccraft:targeted_ender_pearl" + }, + "title": { + "translate": "advancements.reliccraft.use_teleportation_beacon.title" + }, + "description": { + "translate": "advancements.reliccraft.use_teleportation_beacon.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "use": { + "trigger": "reliccraft:use_teleportation_beacon" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/reliccraft/tags/items/items.json b/src/main/resources/data/reliccraft/tags/items/items.json new file mode 100644 index 0000000..b4da246 --- /dev/null +++ b/src/main/resources/data/reliccraft/tags/items/items.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#reliccraft:relics", + "reliccraft:time_dilater", + "reliccraft:teleportation_restrictor", + "reliccraft:teleportation_beacon" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/reliccraft/tags/items/relics.json b/src/main/resources/data/reliccraft/tags/items/relics.json index 0fe691e..df680ab 100644 --- a/src/main/resources/data/reliccraft/tags/items/relics.json +++ b/src/main/resources/data/reliccraft/tags/items/relics.json @@ -2,9 +2,6 @@ "replace": false, "values": [ "reliccraft:staff", - "reliccraft:orb", - "reliccraft:time_dilater", - "reliccraft:teleportation_restrictor", - "reliccraft:teleportation_beacon" + "reliccraft:orb" ] } \ No newline at end of file