diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index b715827b4..fb2778418 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -111,7 +111,7 @@ public class SubTileGenerating extends SubTileEntity { } } - if(!overgrowth && passive) + if(passive) passiveDecayTicks++; } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index f5051bca4..644da94fe 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -104,7 +104,6 @@ public class Botania { public static boolean etFuturumLoaded = false; public static boolean rfApiLoaded = false; public static boolean storageDrawersLoaded = false; - public static boolean quarkLoaded = false; @Instance(LibMisc.MOD_ID) public static Botania instance; @@ -124,8 +123,6 @@ public class Botania { coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); - quarkLoaded = Loader.isModLoaded("Quark"); - storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); BotaniaAPI.internalHandler = new InternalMethodHandler(); diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index ff4a817a9..3e6268126 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -30,7 +30,7 @@ public final class ModAchievements { public static Achievement flowerPickup; public static Achievement lexiconUse; - public static Achievement daybloomPickup; // TODO change this to something else + public static Achievement daybloomPickup; public static Achievement cacophoniumCraft; public static Achievement manaPoolPickup; @@ -91,11 +91,11 @@ public final class ModAchievements { public static void init() { flowerPickup = new AchievementMod(LibAchievementNames.FLOWER_PICKUP, 0, 4, new ItemStack(ModBlocks.flower, 1, 6), null); lexiconUse = new AchievementMod(LibAchievementNames.LEXICON_USE, 1, 5, ModItems.lexicon, flowerPickup); - daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), lexiconUse); // TODO this too + daybloomPickup = new AchievementMod(LibAchievementNames.DAYBLOOM_PICKUP, 3, 5, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), lexiconUse); cacophoniumCraft = new AchievementMod(LibAchievementNames.CACOPHONIUM_CRAFT, -1, 2, ModItems.cacophonium, flowerPickup); manaPoolPickup = new AchievementMod(LibAchievementNames.MANA_POOL_PICKUP, 3, 2, ModBlocks.pool, daybloomPickup); - endoflamePickup = new AchievementMod(LibAchievementNames.ENDOFLAME_PICKUP, 2, 0, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), manaPoolPickup); + endoflamePickup = new AchievementMod(LibAchievementNames.ENDOFLAME_PICKUP, 2, 0, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), manaPoolPickup); tinyPotatoPet = new AchievementMod(LibAchievementNames.TINY_POTATO_PET, 2, -2, ModBlocks.tinyPotato, manaPoolPickup); sparkCraft = new AchievementMod(LibAchievementNames.SPARK_CRAFT, 4, -2, ModItems.spark, manaPoolPickup); baubleWear = new AchievementMod(LibAchievementNames.BAUBLE_WEAR, 4, 0, ModItems.manaRing, manaPoolPickup); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 9e5c727eb..2becc21e6 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -21,6 +21,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; +import vazkii.botania.common.lib.LibMisc; public final class VersionChecker { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index d8236f92e..2ee582194 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1749,24 +1749,6 @@ public final class ModCraftingRecipes { 'A', LibOreDict.ENDER_AIR_BOTTLE); recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); - // 1.8 Stone Chiseling - if (Botania.quarkLoaded) { - recipe18StoneChisel = new ArrayList<>(); - ItemStack[] quarkBlocks = { - new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 2), - new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 3), - new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 1), - new ItemStack(Block.REGISTRY.getObject(new ResourceLocation("Quark", "world_stone_bricks")), 1, 0), - }; - - /*for(int i = 0; i < 4; i++) { todo readd chiseled versions - addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 12), - "SS", "SS", - 'S', quarkBlocks[i]); - recipe18StoneChisel.add(BotaniaAPI.getLatestAddedRecipe()); - }*/ - } - // Blaze Light Recipe addOreDictRecipe(new ItemStack(ModBlocks.blazeBlock), "BBB", "BBB", "BBB", 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 8bf880b26..f8f469fd6 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -27,7 +27,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.api.subtile.signature.SubTileSignature; +import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -120,10 +123,6 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { String type = getType(stack); switch (type) { -// case LibBlockNames.SUBTILE_DAYBLOOM: TODO fix this here -// return ModAchievements.daybloomPickup; - case LibBlockNames.SUBTILE_ENDOFLAME: - return ModAchievements.endoflamePickup; case LibBlockNames.SUBTILE_KEKIMURUS: return ModAchievements.kekimurusPickup; case LibBlockNames.SUBTILE_HEISEI_DREAM: @@ -136,6 +135,12 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return ModAchievements.dandelifeonPickup; case "": return ModAchievements.nullFlower; + default: + Class clazz = BotaniaAPI.getSubTileMapping(type); + if(SubTileGenerating.class.isAssignableFrom(clazz)) + return ModAchievements.daybloomPickup; + else if(SubTileFunctional.class.isAssignableFrom(clazz)) + return ModAchievements.endoflamePickup; } return null; } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index dd2b290a1..7acecaf40 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -293,10 +293,8 @@ public final class LexiconData { public static void init() { BotaniaAPI.addCategory(BotaniaAPI.categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS, 9)); BotaniaAPI.addCategory(BotaniaAPI.categoryMana = new BLexiconCategory(LibLexicon.CATEGORY_MANA, 5)); - BotaniaAPI.addCategory( - BotaniaAPI.categoryGenerationFlowers = new BLexiconCategory(LibLexicon.CATEGORY_GENERATION_FLOWERS, 5)); - BotaniaAPI.addCategory( - BotaniaAPI.categoryFunctionalFlowers = new BLexiconCategory(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS, 5)); + BotaniaAPI.addCategory(BotaniaAPI.categoryGenerationFlowers = new BLexiconCategory(LibLexicon.CATEGORY_GENERATION_FLOWERS, 5)); + BotaniaAPI.addCategory(BotaniaAPI.categoryFunctionalFlowers = new BLexiconCategory(LibLexicon.CATEGORY_FUNCTIONAL_FLOWERS, 5)); BotaniaAPI.addCategory(BotaniaAPI.categoryDevices = new BLexiconCategory(LibLexicon.CATEGORY_DEVICES, 5)); BotaniaAPI.addCategory(BotaniaAPI.categoryTools = new BLexiconCategory(LibLexicon.CATEGORY_TOOLS, 5)); BotaniaAPI.addCategory(BotaniaAPI.categoryBaubles = new BLexiconCategory(LibLexicon.CATEGORY_BAUBLES, 5)); @@ -670,8 +668,7 @@ public final class LexiconData { new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); rafflowsia = new AlfheimLexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); - rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), - new PagePetalRecipe<>("4", ModPetalRecipes.rafflowsiaRecipe)); + rafflowsia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.rafflowsiaRecipe)); dandelifeon = new AlfheimLexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"),