From aa5cfa8a407735a361a3f1b9e8c42f59b4a60ecd Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sat, 29 Nov 2025 16:14:24 -0500 Subject: [PATCH] Remove "Press shift for Recipe" tooltip from alchemy items --- .../common/items/ActivationCrystal.java | 52 ++----------------- .../common/items/ItemAlchemyBase.java | 41 ++------------- .../common/items/potion/AlchemyReagent.java | 31 +---------- .../items/potion/LengtheningCatalyst.java | 31 +---------- .../common/items/potion/PowerCatalyst.java | 31 +---------- .../items/potion/StandardBindingAgent.java | 31 +---------- .../common/items/potion/WeakFillingAgent.java | 31 +---------- .../assets/alchemicalwizardry/lang/en_US.lang | 4 -- .../assets/alchemicalwizardry/lang/ru_RU.lang | 4 -- .../assets/alchemicalwizardry/lang/zh_CN.lang | 4 -- .../assets/alchemicalwizardry/lang/zh_TW.lang | 4 -- 11 files changed, 19 insertions(+), 245 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index f136d426..f407420c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -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 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); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java index b9357dda..39be93e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemAlchemyBase.java @@ -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 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 list) { for (int meta = 0; meta < ITEM_NAMES.length; ++meta) { list.add(new ItemStack(id, 1, meta)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java index b71bc6f9..39071670 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/AlchemyReagent.java @@ -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 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") - + "-"); - } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java index 1ca16b34..29806618 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/LengtheningCatalyst.java @@ -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 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") - + "-"); - } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java index 83f036cb..dc9e34d4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/PowerCatalyst.java @@ -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 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") - + "-"); - } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java index 305d73fe..c359624e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/StandardBindingAgent.java @@ -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 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") - + "-"); - } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java index 9dd10e2b..c334bb8a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/potion/WeakFillingAgent.java @@ -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 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") - + "-"); - } } } diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 50838948..77b5be21 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -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: diff --git a/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang b/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang index 83a05e3d..c9335104 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang @@ -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=Глотков осталось: diff --git a/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang b/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang index 095903a4..22de0384 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang @@ -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=药水剩余: diff --git a/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang b/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang index 807eb0b2..506c27cd 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang @@ -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: