Preparation for the new lexicon page types.

This commit is contained in:
Vasco Lavos committed 2014-02-08 13:17:05 +00:00
1 parent d81323b55f
commit f14d5a4186
8 files changed
+146 -17

No files matched your search

@@ -17,6 +17,9 @@ import net.minecraft.block.Block;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
public class DummyMethodHandler implements IInternalMethodHandler {
@@ -31,15 +34,46 @@ public class DummyMethodHandler implements IInternalMethodHandler {
}
@Override
public LexiconPage recipesPage(String key, List<IRecipe> recipes) {
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage recipePage(String key, IRecipe recipe) {
public LexiconPage craftingRecipePage(String key, IRecipe recipe) {
return dummyPage(key);
}
@Override
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage petalRecipePage(String key, RecipePetals recipe) {
return dummyPage(key);
}
@Override
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) {
return dummyPage(key);
}
@Override
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
return dummyPage(key);
}
private LexiconPage dummyPage(String key) {
return new DummyPage(key);
}
@@ -16,6 +16,9 @@ import java.util.List;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
/**
* Any methods that refer to internal methods in Botania are here.
@@ -30,10 +33,22 @@ public interface IInternalMethodHandler {
public LexiconPage imagePage(String key, String resource);
public LexiconPage recipesPage(String key, List<IRecipe> recipes);
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes);
public LexiconPage recipePage(String key, IRecipe recipe);
public LexiconPage craftingRecipePage(String key, IRecipe recipe);
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes);
public LexiconPage petalRecipePage(String key, RecipePetals recipe);
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes);
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe);
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes);
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe);
public Icon getSubTileIconForName(String name);
}
@@ -18,8 +18,11 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.Icon;
import vazkii.botania.api.internal.IInternalMethodHandler;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.common.block.BlockSpecialFlower;
import vazkii.botania.common.lexicon.page.PageCraftingRecipes;
import vazkii.botania.common.lexicon.page.PageCraftingRecipe;
import vazkii.botania.common.lexicon.page.PageImage;
import vazkii.botania.common.lexicon.page.PageText;
@@ -36,13 +39,13 @@ public class InternalMethodHandler implements IInternalMethodHandler {
}
@Override
public LexiconPage recipesPage(String key, List<IRecipe> recipes) {
return new PageCraftingRecipes(key, recipes);
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes) {
return new PageCraftingRecipe(key, recipes);
}
@Override
public LexiconPage recipePage(String key, IRecipe recipe) {
return new PageCraftingRecipes(key, recipe);
public LexiconPage craftingRecipePage(String key, IRecipe recipe) {
return new PageCraftingRecipe(key, recipe);
}
@Override
@@ -51,4 +54,33 @@ public class InternalMethodHandler implements IInternalMethodHandler {
return icon == null ? Block.plantRed.getIcon(0, 0) : icon;
}
@Override
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes) {
return null;
}
@Override
public LexiconPage petalRecipePage(String key, RecipePetals recipe) {
return null;
}
@Override
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes) {
return null;
}
@Override
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) {
return null;
}
@Override
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes) {
return null;
}
@Override
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
return null;
}
}
@@ -16,7 +16,7 @@ import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.crafting.ModCrafingRecipes;
import vazkii.botania.common.lexicon.page.PageCraftingRecipes;
import vazkii.botania.common.lexicon.page.PageCraftingRecipe;
import vazkii.botania.common.lexicon.page.PageImage;
import vazkii.botania.common.lexicon.page.PageText;
import vazkii.botania.common.lib.LibLexicon;
@@ -47,16 +47,16 @@ public final class LexiconData {
// BASICS ENTRIES
flowers = new BLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics);
flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipes("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipes("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipes("5", ModCrafingRecipes.recipesDyes));
flowers.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_FLOWERS), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipesPetals), new PageCraftingRecipe("4", ModCrafingRecipes.recipePestleAndMortar), new PageCraftingRecipe("5", ModCrafingRecipes.recipesDyes));
apothecary = new BLexiconEntry(LibLexicon.BASICS_APOTHECARY, categoryBasics);
apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageCraftingRecipes("4", ModCrafingRecipes.recipesApothecary));
apothecary.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_APOTHECARY), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCrafingRecipes.recipesApothecary));
lexicon = new BLexiconEntry(LibLexicon.BASICS_LEXICON, categoryBasics);
lexicon.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipes("1", ModCrafingRecipes.recipeLexicon));
lexicon.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLexicon));
wand = new BLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics);
wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipes("1", ModCrafingRecipes.recipesTwigWand));
wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipesTwigWand));
}
}
@@ -40,7 +40,7 @@ import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.lib.LibResources;
import cpw.mods.fml.relauncher.ReflectionHelper;
public class PageCraftingRecipes extends LexiconPage {
public class PageCraftingRecipe extends LexiconPage {
private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY);
@@ -54,12 +54,12 @@ public class PageCraftingRecipes extends LexiconPage {
ItemStack tooltipStack, tooltipContainerStack;
public PageCraftingRecipes(String unlocalizedName, List<IRecipe> recipes) {
public PageCraftingRecipe(String unlocalizedName, List<IRecipe> recipes) {
super(unlocalizedName);
this.recipes = recipes;
}
public PageCraftingRecipes(String unlocalizedName, IRecipe recipe) {
public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) {
this(unlocalizedName, Arrays.asList(recipe));
}
@@ -0,0 +1,16 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Feb 8, 2014, 1:11:42 PM (GMT)]
*/
package vazkii.botania.common.lexicon.page;
public class PageManaInfusionRecipe {
}
@@ -0,0 +1,16 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Feb 8, 2014, 1:11:35 PM (GMT)]
*/
package vazkii.botania.common.lexicon.page;
public class PagePetalRecipe {
}
@@ -0,0 +1,16 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* File Created @ [Feb 8, 2014, 1:11:48 PM (GMT)]
*/
package vazkii.botania.common.lexicon.page;
public class PageRuneRecipe {
}