ILexiconable and implementation of priority research.

This commit is contained in:
Vasco Lavos committed 2014-01-20 19:24:06 +00:00
1 parent e7c071efab
commit 209bd34d3d
9 files changed
+94 -12

No files matched your search

@@ -0,0 +1,29 @@
/**
* 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 @ [Jan 20, 2014, 7:05:44 PM (GMT)]
*/
package vazkii.botania.api;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
* Any block that implements this can be right clicked with
* a Lexica Botania to open a entry page.
*/
public interface ILexiconable {
/**
* Gets the lexicon entry to open at this location. null works too.
*/
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon);
}
+12 -3
View File
@@ -21,21 +21,29 @@ import vazkii.botania.api.page.LexiconPage;
public class LexiconEntry implements Comparable<LexiconEntry>{
public final String unlocalizedName;
public final LexiconCategory category;
public List<LexiconPage> pages = new ArrayList<LexiconPage>();
private boolean priority = false;
/**
* @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display.
*/
public LexiconEntry(String unlocalizedName) {
public LexiconEntry(String unlocalizedName, LexiconCategory category) {
this.unlocalizedName = unlocalizedName;
this.category = category;
}
/**
* Sets this page as prioritized, as in, will appear before others in the lexicon.
*/
public void setPriority() {
public LexiconEntry setPriority() {
priority = true;
return this;
}
public boolean isPriority() {
return priority;
}
public String getUnlocalizedName() {
@@ -45,8 +53,9 @@ public class LexiconEntry implements Comparable<LexiconEntry>{
/**
* Sets what pages you want this entry to have.
*/
public void setLexiconPages(LexiconPage... pages) {
public LexiconEntry setLexiconPages(LexiconPage... pages) {
this.pages.addAll(Arrays.asList(pages));
return this;
}
/**
@@ -12,12 +12,22 @@
package vazkii.botania.client.core.proxy;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.world.World;
import vazkii.botania.api.LexiconEntry;
import vazkii.botania.client.fx.FXSparkle;
import vazkii.botania.client.gui.GuiLexicon;
import vazkii.botania.client.gui.GuiLexiconEntry;
import vazkii.botania.client.gui.GuiLexiconIndex;
import vazkii.botania.common.core.proxy.CommonProxy;
public class ClientProxy extends CommonProxy {
@Override
public void setEntryToOpen(LexiconEntry entry) {
GuiLexicon.currentOpenLexicon = new GuiLexiconEntry(entry, new GuiLexiconIndex(entry.category));
}
@Override
public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {
FXSparkle sparkle = new FXSparkle(world, x, y, z, size, r, g, b, m);
@@ -17,6 +17,7 @@ import java.util.Comparator;
import java.util.List;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import vazkii.botania.api.LexiconCategory;
import vazkii.botania.api.LexiconEntry;
@@ -70,7 +71,7 @@ public class GuiLexiconIndex extends GuiLexicon {
GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i - page * 12);
LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i);
if(entry != null)
button.displayString = StatCollector.translateToLocal(entry.getUnlocalizedName());
button.displayString = (entry.isPriority() ? EnumChatFormatting.ITALIC : "") + StatCollector.translateToLocal(entry.getUnlocalizedName());
else button.displayString = "";
}
}
@@ -19,21 +19,25 @@ import net.minecraft.block.BlockFlower;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.ILexiconable;
import vazkii.botania.api.LexiconEntry;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockModFlower;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockIDs;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockModFlower extends BlockFlower {
public class BlockModFlower extends BlockFlower implements ILexiconable {
Icon[] icons;
@@ -87,4 +91,9 @@ public class BlockModFlower extends BlockFlower {
Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
}
@Override
public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) {
return LexiconData.flowers;
}
}
@@ -14,6 +14,7 @@ package vazkii.botania.common.core.proxy;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.LexiconEntry;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -53,6 +54,10 @@ public class CommonProxy {
public void postInit(FMLPostInitializationEvent event) {
}
public void setEntryToOpen(LexiconEntry entry) {
// NO-OP
}
public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {
// NO-OP
@@ -11,10 +11,13 @@
*/
package vazkii.botania.common.item;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import vazkii.botania.api.ILexiconable;
import vazkii.botania.api.LexiconEntry;
import vazkii.botania.common.Botania;
import vazkii.botania.common.lib.LibGuiIDs;
import vazkii.botania.common.lib.LibItemIDs;
@@ -27,6 +30,22 @@ public class ItemLexicon extends ItemMod {
setMaxStackSize(1);
setUnlocalizedName(LibItemNames.LEXICON);
}
@Override
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
int id = par3World.getBlockId(par4, par5, par6);
Block block = Block.blocksList[id];
if(block != null && block instanceof ILexiconable) {
LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, par4, par5, par6, par2EntityPlayer, par1ItemStack);
if(entry != null) {
Botania.proxy.setEntryToOpen(entry);
par2EntityPlayer.openGui(Botania.instance, LibGuiIDs.LEXICON, par3World, 0, 0, 0);
return true;
}
}
return false;
}
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
@@ -19,16 +19,16 @@ import vazkii.botania.api.page.LexiconPage;
public class BLexiconEntry extends LexiconEntry {
public BLexiconEntry(String unlocalizedName, LexiconCategory category) {
super(unlocalizedName);
super(unlocalizedName, category);
BotaniaAPI.addEntry(this, category);
}
@Override
public void setLexiconPages(LexiconPage... pages) {
public LexiconEntry setLexiconPages(LexiconPage... pages) {
for(LexiconPage page : pages)
page.unlocalizedName = "botania.page." + getLazyUnlocalizedName() + page.unlocalizedName;
super.setLexiconPages(pages);
return super.setLexiconPages(pages);
}
@Override
@@ -29,6 +29,8 @@ public final class LexiconData {
public static LexiconCategory categoryDevices;
public static LexiconCategory categoryTools;
public static LexiconCategory categoryMisc;
public static LexiconEntry flowers;
public static void init() {
BotaniaAPI.addCategory(categoryBasics = new LexiconCategory(LibLexicon.CATEGORY_BASICS));
@@ -38,11 +40,9 @@ public final class LexiconData {
BotaniaAPI.addCategory(categoryTools = new LexiconCategory(LibLexicon.CATEGORY_TOOLS));
BotaniaAPI.addCategory(categoryMisc = new LexiconCategory(LibLexicon.CATEGORY_MISC));
LexiconEntry entry;
// BASICS ENTRIES
entry = new BLexiconEntry(LibLexicon.BASICS_FLOWERS, categoryBasics);
entry.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 = 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));
// ENERGY ENTRIES