From 86b98cab131c780c96545e699f6da4c63d785871 Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 10 Dec 2016 18:13:27 -0800 Subject: [PATCH] Unify tooltip messages, fix cable subtypes, and fix ruby drops --- .../techreborn/client/StackToolTipEvent.java | 20 ++++++------------- .../techreborn/events/BlockBreakHandler.java | 5 +---- .../parts/powerCables/ItemCables.java | 13 +++++++----- .../assets/techreborn/lang/en_us.lang | 2 +- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index f6526ca0a..4a7a9a345 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -12,7 +12,6 @@ import org.lwjgl.input.Keyboard; import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.util.Color; import techreborn.Core; public class StackToolTipEvent { @@ -22,6 +21,10 @@ public class StackToolTipEvent { if (event.getItemStack().getItem() instanceof IListInfoProvider) { ((IListInfoProvider) event.getItemStack().getItem()).addInfo(event.getToolTip(), false); } else if (event.getItemStack().getItem() instanceof IEnergyInterfaceItem) { + event.getToolTip().add(1, TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormattedNoSuffix( + (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack())) + + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack())) + + " " + PowerSystem.getDisplayPower().abbreviation); if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { int percentage = percentage( (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()), @@ -34,19 +37,8 @@ public class StackToolTipEvent { } else { color = TextFormatting.YELLOW; } - event.getToolTip().add(color + "" - + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack())) - + TextFormatting.LIGHT_PURPLE + " stored"); - event.getToolTip().add(Color.GREEN + "" - + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack())) - + TextFormatting.LIGHT_PURPLE + " max"); - event.getToolTip() - .add(TextFormatting.GREEN + "" + percentage + "%" + TextFormatting.LIGHT_PURPLE + " charged"); - event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocaliszedPower( - (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack())) - + TextFormatting.LIGHT_PURPLE + " /tick in/out"); + event.getToolTip().add(2, color + "" + percentage + "%" + TextFormatting.GRAY + " Charged"); + event.getToolTip().add(3, TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormatted((int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack())) + TextFormatting.GRAY + " I/O Rate"); } } else { try { diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index c8eb1b9ad..add99cf5e 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -1,6 +1,5 @@ package techreborn.events; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -16,9 +15,7 @@ public class BlockBreakHandler { public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) { for (ItemStack ore : event.getDrops()) { if (OreDictUtils.isOre(ore, "gemRuby")) { - EntityItem item = new EntityItem(event.getWorld(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), - ItemGems.getGemByName("redGarnet").copy()); - event.getWorld().spawnEntity(item); + event.getDrops().add(ItemGems.getGemByName("redGarnet").copy()); } } } diff --git a/src/main/java/techreborn/parts/powerCables/ItemCables.java b/src/main/java/techreborn/parts/powerCables/ItemCables.java index 0638598a0..2e3cf0e9a 100644 --- a/src/main/java/techreborn/parts/powerCables/ItemCables.java +++ b/src/main/java/techreborn/parts/powerCables/ItemCables.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; @@ -15,6 +16,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; +import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.util.StringUtils; import reborncore.mcmultipart.item.ItemMultiPart; import reborncore.mcmultipart.multipart.IMultipart; import techreborn.client.TechRebornCreativeTab; @@ -59,10 +62,10 @@ public class ItemCables extends ItemMultiPart implements ITexturedItem { return super.getUnlocalizedName() + "." + EnumCableType.values()[meta]; } - // Adds Dusts SubItems To Creative Tab - public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { + @Override + public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { for (int meta = 0; meta < EnumCableType.values().length; ++meta) { - list.add(new ItemStack(item, 1, meta)); + subItems.add(new ItemStack(itemIn, 1, meta)); } } @@ -85,10 +88,10 @@ public class ItemCables extends ItemMultiPart implements ITexturedItem { @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { EnumCableType type = EnumCableType.values()[stack.getItemDamage()]; - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.euTransfer") + TextFormatting.LIGHT_PURPLE + type.transferRate); + tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("desc.transfer") + " " + TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormatted(type.transferRate)); + tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("desc.tier") + " " + TextFormatting.GOLD + StringUtils.toFirstCapitalAllLowercase(type.tier.toString())); if (type.canKill) { tooltip.add(TextFormatting.RED + I18n.translateToLocal("desc.uninsulatedCable")); } - tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.tier") + TextFormatting.LIGHT_PURPLE + type.tier); } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 4e04864ea..d5ea11f93 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -925,7 +925,7 @@ Cable.glassFiberCable.name=Glass Fiber Cable Cable.tinCable.name=Tin Cable desc.uninsulatedCable=Damages Entities! -desc.euTransfer=EU Transfer: +desc.transfer=Energy Transfer: desc.tier=Tier: