diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 1bdcd7354..625a758cc 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -66,6 +66,7 @@ public final class ModAchievements { public static Achievement relicLokiRing; public static Achievement relicAesirRing; + public static Achievement nullFlower; public static Achievement desuGun; public static void init() { @@ -115,6 +116,9 @@ public final class ModAchievements { relicAesirRing = new AchievementMod(LibAchievementNames.RELIC_AESIR_RING, -7, 5, ModItems.aesirRing, null).setSpecial(); } + + nullFlower = new AchievementMod(LibAchievementNames.NULL_FLOWER, -8, -4, ModBlocks.specialFlower, null).setSpecial(); + ItemStack desu = new ItemStack(ModItems.manaGun); desu.setStackDisplayName("desu gun"); desuGun = new AchievementMod(LibAchievementNames.DESU_GUN, -8, -2, desu, null).setSpecial(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index b6ad4e489..c03ff5503 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -126,6 +126,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return ModAchievements.kekimurusPickup; else if(type.equals(LibBlockNames.SUBTILE_HEISEI_DREAM)) return ModAchievements.heiseiDreamPickup; + else if(type.equals("")) + return ModAchievements.nullFlower; return null; } diff --git a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java index 9125fbd5d..d52bbc57c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java @@ -50,6 +50,7 @@ public final class LibAchievementNames { public static final String RELIC_LOKI_RING = "lokiRing"; public static final String RELIC_AESIR_RING = "aesirRing"; + public static final String NULL_FLOWER = "nullFlower"; public static final String DESU_GUN = "desuGun"; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4b4d82e2c..9958c160c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -476,6 +476,8 @@ achievement.botania:lokiRing.desc=Be rewarded the Ring of Loki for a heroic feat achievement.botania:aesirRing=As the Gods Say achievement.botania:aesirRing.desc=Create the Ring of the Aesir by combining the Rings of the Gods +achievement.botania:nullFlower=Take it Easy +achievement.botania:nullFlower.desc=Find a bug that lets you have an undefined Botania Flower. Don't forget to report it! achievement.botania:desuGun=Two-Faced Lovers achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN # ^ Don't localize