From 966406d1951fe94f2458710db99f4de39c72ca59 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 30 Jul 2017 14:24:43 -0500 Subject: [PATCH] Fix relic lexicon entries and add relic advancements --- .../botania/common/lexicon/LexiconData.java | 28 ++++++++++--------- .../common/lexicon/RelicLexiconEntry.java | 12 ++++---- .../advancements/challenge/aesir_ring.json | 27 ++++++++++++++++++ .../advancements/challenge/desu_gun.json | 3 +- .../advancements/challenge/flugel_eye.json | 27 ++++++++++++++++++ .../challenge/gaia_guardian_no_armor.json | 3 +- .../challenge/infinite_fruit.json | 27 ++++++++++++++++++ .../advancements/challenge/king_key.json | 27 ++++++++++++++++++ .../advancements/challenge/l20_shard_use.json | 3 +- .../advancements/challenge/loki_ring.json | 27 ++++++++++++++++++ .../advancements/challenge/null_flower.json | 3 +- .../advancements/challenge/odin_ring.json | 27 ++++++++++++++++++ .../advancements/challenge/pinkinator.json | 3 +- .../advancements/challenge/rank_ss_pick.json | 3 +- .../challenge/super_corporea_request.json | 3 +- .../advancements/challenge/thor_ring.json | 27 ++++++++++++++++++ 16 files changed, 223 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/assets/botania/advancements/challenge/aesir_ring.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/flugel_eye.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/king_key.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/loki_ring.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/odin_ring.json create mode 100644 src/main/resources/assets/botania/advancements/challenge/thor_ring.json diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index dd77447be..555daa2be 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -13,6 +13,7 @@ package vazkii.botania.common.lexicon; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.lexicon.LexiconCategory; @@ -49,6 +50,7 @@ import vazkii.botania.common.lexicon.page.PageTerrasteel; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibLexicon; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; @@ -1301,25 +1303,25 @@ public final class LexiconData { relicInfo = new RelicLexiconEntry(LibLexicon.ALF_RELIC_INFO, categoryAlfhomancy, null); relicInfo.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.dice)); - /*infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, - ModAchievements.relicInfiniteFruit); - infiniteFruit.setLexiconPages(new PageText("0")); + infiniteFruit = new RelicLexiconEntry(LibLexicon.ALF_INFINITE_FRUIT, categoryAlfhomancy, + new ResourceLocation(LibMisc.MOD_ID, "challenge/infinite_fruit")); + infiniteFruit.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.infiniteFruit)); - kingKey = new RelicLexiconEntry(LibLexicon.ALF_KING_KEY, categoryAlfhomancy, ModAchievements.relicKingKey); - kingKey.setLexiconPages(new PageText("0")); + kingKey = new RelicLexiconEntry(LibLexicon.ALF_KING_KEY, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/king_key")); + kingKey.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.kingKey)); flugelEye = new RelicLexiconEntry(LibLexicon.ALF_FLUGEL_EYE, categoryAlfhomancy, - ModAchievements.relicFlugelEye); - flugelEye.setLexiconPages(new PageText("0"), new PageText("1")); + new ResourceLocation(LibMisc.MOD_ID, "challenge/flugel_eye")); + flugelEye.setLexiconPages(new PageText("0"), new PageText("1")).setIcon(new ItemStack(ModItems.flugelEye)); - thorRing = new RelicLexiconEntry(LibLexicon.ALF_THOR_RING, categoryAlfhomancy, ModAchievements.relicThorRing); - thorRing.setLexiconPages(new PageText("0")); + thorRing = new RelicLexiconEntry(LibLexicon.ALF_THOR_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/thor_ring")); + thorRing.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.thorRing)); - lokiRing = new RelicLexiconEntry(LibLexicon.ALF_LOKI_RING, categoryAlfhomancy, ModAchievements.relicLokiRing); - lokiRing.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")); + lokiRing = new RelicLexiconEntry(LibLexicon.ALF_LOKI_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/loki_ring")); + lokiRing.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3")).setIcon(new ItemStack(ModItems.lokiRing)); - odinRing = new RelicLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, ModAchievements.relicOdinRing); - odinRing.setLexiconPages(new PageText("0")); todo 1.12 */ + odinRing = new RelicLexiconEntry(LibLexicon.ALF_ODIN_RING, categoryAlfhomancy, new ResourceLocation(LibMisc.MOD_ID, "challenge/odin_ring")); + odinRing.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.odinRing)); } decorativeBlocks = new BasicLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index 324442bd9..80024c468 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -14,6 +14,7 @@ import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -21,25 +22,22 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; public class RelicLexiconEntry extends BasicLexiconEntry { - - final ResourceLocation a; + private final ResourceLocation advancement; public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) { super(unlocalizedName, category); setKnowledgeType(BotaniaAPI.relicKnowledge); - this.a = advancement; - /*if(a != null) todo 1.12 - setIcon(a.theItemStack.copy());*/ + this.advancement = advancement; } @Override @SideOnly(Side.CLIENT) public boolean isVisible() { EntityPlayerSP player = Minecraft.getMinecraft().player; - if(a == null || player.capabilities.isCreativeMode) { + if(advancement == null || player.capabilities.isCreativeMode) { return true; } else { - Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a); + Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(advancement); AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv); return progress != null && progress.isDone(); } diff --git a/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json b/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json new file mode 100644 index 000000000..7698f8fbc --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:aesirring" + }, + "title": { + "translate": "advancement.botania:aesirRing" + }, + "description": { + "translate": "advancement.botania:aesirRing.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "ring": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:aesirring" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/desu_gun.json b/src/main/resources/assets/botania/advancements/challenge/desu_gun.json index c2996306f..b5f813ec6 100644 --- a/src/main/resources/assets/botania/advancements/challenge/desu_gun.json +++ b/src/main/resources/assets/botania/advancements/challenge/desu_gun.json @@ -9,7 +9,8 @@ }, "description": { "translate": "advancement.botania:desuGun.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json b/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json new file mode 100644 index 000000000..9d6e89bb2 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:flugeleye" + }, + "title": { + "translate": "advancement.botania:flugelEye" + }, + "description": { + "translate": "advancement.botania:flugelEye.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "eye": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:flugeleye" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json index 69155bc7a..4bb99369a 100644 --- a/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json +++ b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json @@ -9,7 +9,8 @@ }, "description": { "translate": "advancement.botania:gaiaGuardianNoArmor.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json b/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json new file mode 100644 index 000000000..b81ca1657 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:infinitefruit" + }, + "title": { + "translate": "advancement.botania:infiniteFruit" + }, + "description": { + "translate": "advancement.botania:infiniteFruit.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "fruit": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:infinitefruit" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/king_key.json b/src/main/resources/assets/botania/advancements/challenge/king_key.json new file mode 100644 index 000000000..d17a750be --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/king_key.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:kingkey" + }, + "title": { + "translate": "advancement.botania:kingKey" + }, + "description": { + "translate": "advancement.botania:kingKey.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "key": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:kingkey" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json b/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json index aaa80bda8..6ce8b6ebf 100644 --- a/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json +++ b/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json @@ -8,7 +8,8 @@ }, "description": { "translate": "advancement.botania:l20ShardUse.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/loki_ring.json b/src/main/resources/assets/botania/advancements/challenge/loki_ring.json new file mode 100644 index 000000000..33e01361a --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/loki_ring.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:lokiring" + }, + "title": { + "translate": "advancement.botania:lokiRing" + }, + "description": { + "translate": "advancement.botania:lokiRing.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "ring": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:lokiring" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/null_flower.json b/src/main/resources/assets/botania/advancements/challenge/null_flower.json index 9dcca3f43..0ddd9f361 100644 --- a/src/main/resources/assets/botania/advancements/challenge/null_flower.json +++ b/src/main/resources/assets/botania/advancements/challenge/null_flower.json @@ -8,7 +8,8 @@ }, "description": { "translate": "advancement.botania:nullFlower.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/odin_ring.json b/src/main/resources/assets/botania/advancements/challenge/odin_ring.json new file mode 100644 index 000000000..90e9e1ee8 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/odin_ring.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:odinring" + }, + "title": { + "translate": "advancement.botania:odinRing" + }, + "description": { + "translate": "advancement.botania:odinRing.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "ring": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:odinring" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/pinkinator.json b/src/main/resources/assets/botania/advancements/challenge/pinkinator.json index 580057275..14ae52551 100644 --- a/src/main/resources/assets/botania/advancements/challenge/pinkinator.json +++ b/src/main/resources/assets/botania/advancements/challenge/pinkinator.json @@ -8,7 +8,8 @@ }, "description": { "translate": "advancement.botania:pinkinator.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json b/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json index 2c917c000..ded922cf2 100644 --- a/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json +++ b/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json @@ -8,7 +8,8 @@ }, "description": { "translate": "advancement.botania:rankSSPick.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json index ff9ea2862..8947bd235 100644 --- a/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json +++ b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json @@ -8,7 +8,8 @@ }, "description": { "translate": "advancement.botania:superCorporeaRequest.desc" - } + }, + "frame": "challenge" }, "parent": "botania:challenge/root", "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", diff --git a/src/main/resources/assets/botania/advancements/challenge/thor_ring.json b/src/main/resources/assets/botania/advancements/challenge/thor_ring.json new file mode 100644 index 000000000..035e7ad04 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/thor_ring.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "botania:thorring" + }, + "title": { + "translate": "advancement.botania:thorRing" + }, + "description": { + "translate": "advancement.botania:thorRing.desc" + }, + "frame": "challenge" + }, + "parent": "botania:challenge/root", + "criteria": { + "ring": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:thorring" + } + ] + } + } + } +} \ No newline at end of file