From 5e875fabac61c10c8f49afbf74c396ba1d06d113 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 9 Sep 2014 17:15:59 +0100 Subject: [PATCH] Added the ability for lexicon pages to skip registry. Skipped the registry in the block -> quartz recipe for alchemy. API version 13. --- MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java | 7 +++++-- MODSRC/vazkii/botania/api/lexicon/LexiconPage.java | 8 +++++++- MODSRC/vazkii/botania/api/package-info.java | 2 +- MODSRC/vazkii/botania/common/lexicon/LexiconData.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java b/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java index df60cd25e..bbc475c46 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java @@ -70,8 +70,11 @@ public class LexiconEntry implements Comparable { public LexiconEntry setLexiconPages(LexiconPage... pages) { this.pages.addAll(Arrays.asList(pages)); - for(int i = 0; i < this.pages.size(); i++) - this.pages.get(i).onPageAdded(this, i); + for(int i = 0; i < this.pages.size(); i++) { + LexiconPage page = this.pages.get(i); + if(!page.skipRegistry) + page.onPageAdded(this, i); + } return this; } diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java b/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java index d5f902498..5cf3c6167 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java @@ -18,7 +18,8 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class LexiconPage { public String unlocalizedName; - + public boolean skipRegistry; + public LexiconPage(String unlocalizedName) { this.unlocalizedName = unlocalizedName; } @@ -58,4 +59,9 @@ public abstract class LexiconPage { public String getUnlocalizedName() { return unlocalizedName; } + + public LexiconPage setSkipRegistry() { + skipRegistry = true; + return this; + } } diff --git a/MODSRC/vazkii/botania/api/package-info.java b/MODSRC/vazkii/botania/api/package-info.java index d4eba1dab..6fc65711f 100644 --- a/MODSRC/vazkii/botania/api/package-info.java +++ b/MODSRC/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "12", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "13", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index bf88105d0..791b7e7cb 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -412,7 +412,7 @@ public final class LexiconData { alchemy = new BLexiconEntry(LibLexicon.DEVICE_ALCHEMY, categoryDevices); alchemy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeAlchemyCatalyst), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.leatherRecipe), new PageManaInfusionRecipe("3", ModManaAlchemyRecipes.woodRecipes), new PageManaInfusionRecipe("4", ModManaAlchemyRecipes.saplingRecipes), new PageManaInfusionRecipe("5", ModManaAlchemyRecipes.glowstoneDustRecipe), - new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), + new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes).setSkipRegistry(), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballCactusRecipes), new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe), new PageManaInfusionRecipe("21", ModManaAlchemyRecipes.coarseDirtRecipe));