mirror of
https://github.com/GTNewHorizons/BloodMagic.git
synced 2026-11-21 04:22:29 +00:00
Merge remote-tracking branch 'origin/recipe-tooltip' into dev
This commit is contained in:
11 files changed
+19
-245
No files matched your search
@@ -7,16 +7,12 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -48,51 +44,13 @@ public class ActivationCrystal extends EnergyItems {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
switch (par1ItemStack.getItemDamage()) {
|
||||
case 0: {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.lowlevelrituals"));
|
||||
break;
|
||||
}
|
||||
|
||||
case 1: {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.powerfulrituals"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(
|
||||
EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case 2: {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.creativeonly"));
|
||||
|
||||
break;
|
||||
}
|
||||
case 0 -> par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.lowlevelrituals"));
|
||||
case 1 -> par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.powerfulrituals"));
|
||||
case 2 -> par3List.add(StatCollector.translateToLocal("tooltip.activationcrystal.creativeonly"));
|
||||
}
|
||||
|
||||
addBindingInformation(par1ItemStack, par3List);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,16 +7,11 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -46,43 +41,15 @@ public class ItemAlchemyBase extends Item {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack itemStack) {
|
||||
int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1);
|
||||
return ("" + "item.bloodMagicAlchemyItem." + ITEM_NAMES[meta]);
|
||||
return ("item.bloodMagicAlchemyItem." + ITEM_NAMES[meta]);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -94,7 +61,7 @@ public class ItemAlchemyBase extends Item {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item id, CreativeTabs creativeTab, List list) {
|
||||
public void getSubItems(Item id, CreativeTabs creativeTab, List<ItemStack> list) {
|
||||
for (int meta = 0; meta < ITEM_NAMES.length; ++meta) {
|
||||
list.add(new ItemStack(id, 1, meta));
|
||||
}
|
||||
|
||||
@@ -6,14 +6,10 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.ModItems;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -70,31 +66,8 @@ public class AlchemyReagent extends Item {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-29
@@ -5,13 +5,9 @@ import java.util.List;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.common.ICatalyst;
|
||||
|
||||
public class LengtheningCatalyst extends Item implements ICatalyst {
|
||||
@@ -34,31 +30,8 @@ public class LengtheningCatalyst extends Item implements ICatalyst {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,13 +5,9 @@ import java.util.List;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.common.ICatalyst;
|
||||
|
||||
public class PowerCatalyst extends Item implements ICatalyst {
|
||||
@@ -35,31 +31,8 @@ public class PowerCatalyst extends Item implements ICatalyst {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-29
@@ -6,13 +6,9 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.common.IBindingAgent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -36,31 +32,8 @@ public class StandardBindingAgent extends Item implements IBindingAgent {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-29
@@ -7,13 +7,9 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
|
||||
import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
|
||||
import WayofTime.alchemicalWizardry.common.IFillingAgent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -51,31 +47,8 @@ public class WeakFillingAgent extends Item implements IFillingAgent {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
|
||||
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List<String> par3List,
|
||||
boolean par4) {
|
||||
par3List.add(StatCollector.translateToLocal("tooltip.alchemy.usedinalchemy"));
|
||||
|
||||
if (Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
|
||||
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(par1ItemStack);
|
||||
|
||||
if (recipe != null) {
|
||||
par3List.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal("tooltip.alchemy.recipe"));
|
||||
|
||||
for (ItemStack item : recipe) {
|
||||
if (item != null) {
|
||||
par3List.add("" + item.getDisplayName());
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
par3List.add(
|
||||
"-" + StatCollector.translateToLocal("tooltip.alchemy.press")
|
||||
+ " "
|
||||
+ EnumChatFormatting.BLUE
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.shift")
|
||||
+ EnumChatFormatting.GRAY
|
||||
+ " "
|
||||
+ StatCollector.translateToLocal("tooltip.alchemy.forrecipe")
|
||||
+ "-");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -423,11 +423,7 @@ tooltip.alchemy.coords=Coords:
|
||||
tooltip.alchemy.damage=Damage:
|
||||
tooltip.alchemy.dimension=Bound Dimension:
|
||||
tooltip.alchemy.direction=Direction:
|
||||
tooltip.alchemy.forrecipe=for Recipe
|
||||
tooltip.alchemy.press=Press
|
||||
tooltip.alchemy.recipe=Recipe:
|
||||
tooltip.alchemy.ritualid=RitualID:
|
||||
tooltip.alchemy.shift=shift
|
||||
tooltip.alchemy.usedinalchemy=Used in Alchemy
|
||||
tooltip.alchemyflask.caution=CAUTION: Contents are throwable
|
||||
tooltip.alchemyflask.swigsleft=Swigs Left:
|
||||
|
||||
@@ -300,11 +300,7 @@ tooltip.alchemy.coords=Координаты:
|
||||
tooltip.alchemy.damage=Урон:
|
||||
tooltip.alchemy.dimension=Связанное измерение:
|
||||
tooltip.alchemy.direction=Направление:
|
||||
tooltip.alchemy.forrecipe=чтобы увидеть рецепт
|
||||
tooltip.alchemy.press=Нажмите
|
||||
tooltip.alchemy.recipe=Рецепт:
|
||||
tooltip.alchemy.ritualid=ID ритуала:
|
||||
tooltip.alchemy.shift=shift,
|
||||
tooltip.alchemy.usedinalchemy=Используется в алхимии
|
||||
tooltip.alchemyflask.caution=ВНИМАНИЕ: Содержимое можно кидать
|
||||
tooltip.alchemyflask.swigsleft=Глотков осталось:
|
||||
|
||||
@@ -396,11 +396,7 @@ tooltip.alchemy.coords=坐标:
|
||||
tooltip.alchemy.damage=攻击伤害:
|
||||
tooltip.alchemy.dimension=绑定世界:
|
||||
tooltip.alchemy.direction=方向:
|
||||
tooltip.alchemy.forrecipe=了解配方
|
||||
tooltip.alchemy.press=对着物品按
|
||||
tooltip.alchemy.recipe=材料:
|
||||
tooltip.alchemy.ritualid=仪式ID:
|
||||
tooltip.alchemy.shift=shift
|
||||
tooltip.alchemy.usedinalchemy=用于炼金术
|
||||
tooltip.alchemyflask.caution=警 告: 内部异常
|
||||
tooltip.alchemyflask.swigsleft=药水剩余:
|
||||
|
||||
@@ -312,11 +312,7 @@ tooltip.alchemy.coords=Coords:
|
||||
tooltip.alchemy.damage=Damage:
|
||||
tooltip.alchemy.dimension=Bound Dimension:
|
||||
tooltip.alchemy.direction=Direction:
|
||||
tooltip.alchemy.forrecipe=for Recipe
|
||||
tooltip.alchemy.press=Press
|
||||
tooltip.alchemy.recipe=Recipe:
|
||||
tooltip.alchemy.ritualid=RitualID:
|
||||
tooltip.alchemy.shift=shift
|
||||
tooltip.alchemy.usedinalchemy=Used in Alchemy
|
||||
tooltip.alchemyflask.caution=CAUTION: Contents are throwable
|
||||
tooltip.alchemyflask.swigsleft=Swigs Left:
|
||||
|
||||
Reference in new issue
Block a user