Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@
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;
Expand Down Expand Up @@ -48,51 +44,13 @@ public void registerIcons(IIconRegister iconRegister) {
}

@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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@
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;

Expand Down Expand Up @@ -46,43 +41,15 @@ public void registerIcons(IIconRegister iconRegister) {
}

@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
Expand All @@ -94,7 +61,7 @@ public IIcon getIconFromDamage(int meta) {

@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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
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;

Expand Down Expand Up @@ -70,31 +66,8 @@ public void registerIcons(IIconRegister iconRegister) {
}

@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")
+ "-");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
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 {
Expand All @@ -34,31 +30,8 @@ public boolean isConcentration() {
}

@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")
+ "-");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
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 {
Expand All @@ -35,31 +31,8 @@ public boolean isConcentration() {
}

@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")
+ "-");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@
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;
Expand All @@ -36,31 +32,8 @@ public void registerIcons(IIconRegister iconRegister) {
}

@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")
+ "-");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@
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;
Expand Down Expand Up @@ -51,31 +47,8 @@ public void registerIcons(IIconRegister iconRegister) {
}

@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")
+ "-");
}
}
}
4 changes: 0 additions & 4 deletions src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading