mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Flowers' tooltips now tell you what type of flower they are.
This commit is contained in:
1 parent
3f74536fcc
commit
b5af383f61
7 files changed
+77
-7
No files matched your search
@@ -10,10 +10,18 @@
|
||||
*/
|
||||
package vazkii.botania.api.subtile.signature;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.subtile.SubTileEntity;
|
||||
import vazkii.botania.api.subtile.SubTileFunctional;
|
||||
import vazkii.botania.api.subtile.SubTileGenerating;
|
||||
|
||||
/**
|
||||
* A basic (and fallback) implementation of SubTileSignature.
|
||||
@@ -49,6 +57,31 @@ public class BasicSignature extends SubTileSignature {
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
Class<? extends SubTileEntity> clazz = BotaniaAPI.getSubTileMapping(name);
|
||||
|
||||
if(clazz == null)
|
||||
return "uwotm8";
|
||||
|
||||
System.out.println(clazz + " " + clazz.isAssignableFrom(SubTileGenerating.class));
|
||||
|
||||
if(clazz.getAnnotation(PassiveFlower.class) != null)
|
||||
return "botania.flowerType.passiveGenerating";
|
||||
|
||||
if(SubTileGenerating.class.isAssignableFrom(clazz))
|
||||
return "botania.flowerType.generating";
|
||||
|
||||
if(SubTileFunctional.class.isAssignableFrom(clazz))
|
||||
return "botania.flowerType.functional";
|
||||
|
||||
return "botania.flowerType.misc";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTooltip(ItemStack stack, EntityPlayer player, List<String> tooltip) {
|
||||
tooltip.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal(getType()));
|
||||
}
|
||||
|
||||
private String unlocalizedName(String end) {
|
||||
return "tile.botania:" + SubTileSignature.SPECIAL_FLOWER_PREFIX + name + end;
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* 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 the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [04/12/2015, 16:47:01 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.subtile.signature;
|
||||
|
||||
import static java.lang.annotation.ElementType.TYPE;
|
||||
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
|
||||
/**
|
||||
* This annotation used for detecting whether a SubTileEntity
|
||||
* is a passive flower without having to instantiate it. This
|
||||
* is used for the flowers' tooltips.
|
||||
*/
|
||||
@Retention(value = RUNTIME)
|
||||
@Target(value = TYPE)
|
||||
public @interface PassiveFlower {
|
||||
|
||||
}
|
||||
@@ -10,19 +10,15 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.ISubTileContainer;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileDaybloom extends SubTilePassiveGenerating {
|
||||
|
||||
private static final String TAG_PRIME_POSITION_X = "primePositionX";
|
||||
|
||||
@@ -26,11 +26,13 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.ISubTileContainer;
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileHydroangeas extends SubTilePassiveGenerating {
|
||||
|
||||
private static final String TAG_BURN_TIME = "burnTime";
|
||||
|
||||
@@ -11,8 +11,10 @@
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.subtile.signature.PassiveFlower;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
@PassiveFlower
|
||||
public class SubTileNightshade extends SubTileDaybloom {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -84,6 +84,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
|
||||
String type = getType(par1ItemStack);
|
||||
SubTileSignature sig = BotaniaAPI.getSignatureForName(type);
|
||||
|
||||
sig.addTooltip(par1ItemStack, par2EntityPlayer, par3List);
|
||||
|
||||
if(ConfigHandler.referencesEnabled) {
|
||||
String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack);
|
||||
String refLocalized = StatCollector.translateToLocal(refUnlocalized);
|
||||
@@ -94,7 +96,6 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
|
||||
String mod = BotaniaAPI.subTileMods.get(type);
|
||||
if(!mod.equals(LibMisc.MOD_ID))
|
||||
par3List.add(EnumChatFormatting.ITALIC + "[" + mod + "]");
|
||||
sig.addTooltip(par1ItemStack, par2EntityPlayer, par3List);
|
||||
}
|
||||
|
||||
public static String getType(ItemStack stack) {
|
||||
|
||||
Reference in new issue
Block a user