Unify tooltip messages, fix cable subtypes, and fix ruby drops

This commit is contained in:
ProfessorProspector 2016-12-10 18:13:27 -08:00
parent 61de7101c3
commit 86b98cab13
4 changed files with 16 additions and 24 deletions

View file

@ -12,7 +12,6 @@ import org.lwjgl.input.Keyboard;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.power.IEnergyInterfaceItem; import reborncore.api.power.IEnergyInterfaceItem;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.Color;
import techreborn.Core; import techreborn.Core;
public class StackToolTipEvent { public class StackToolTipEvent {
@ -22,6 +21,10 @@ public class StackToolTipEvent {
if (event.getItemStack().getItem() instanceof IListInfoProvider) { if (event.getItemStack().getItem() instanceof IListInfoProvider) {
((IListInfoProvider) event.getItemStack().getItem()).addInfo(event.getToolTip(), false); ((IListInfoProvider) event.getItemStack().getItem()).addInfo(event.getToolTip(), false);
} else if (event.getItemStack().getItem() instanceof IEnergyInterfaceItem) { } 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)) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
int percentage = percentage( int percentage = percentage(
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()), (int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()),
@ -34,19 +37,8 @@ public class StackToolTipEvent {
} else { } else {
color = TextFormatting.YELLOW; color = TextFormatting.YELLOW;
} }
event.getToolTip().add(color + "" event.getToolTip().add(2, color + "" + percentage + "%" + TextFormatting.GRAY + " Charged");
+ PowerSystem.getLocaliszedPower( event.getToolTip().add(3, TextFormatting.GOLD + PowerSystem.getLocaliszedPowerFormatted((int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack())) + TextFormatting.GRAY + " I/O Rate");
(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");
} }
} else { } else {
try { try {

View file

@ -1,6 +1,5 @@
package techreborn.events; package techreborn.events;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@ -16,9 +15,7 @@ public class BlockBreakHandler {
public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) { public void onBlockHarvest(BlockEvent.HarvestDropsEvent event) {
for (ItemStack ore : event.getDrops()) { for (ItemStack ore : event.getDrops()) {
if (OreDictUtils.isOre(ore, "gemRuby")) { if (OreDictUtils.isOre(ore, "gemRuby")) {
EntityItem item = new EntityItem(event.getWorld(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), event.getDrops().add(ItemGems.getGemByName("redGarnet").copy());
ItemGems.getGemByName("redGarnet").copy());
event.getWorld().spawnEntity(item);
} }
} }
} }

View file

@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextFormatting; 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.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.StringUtils;
import reborncore.mcmultipart.item.ItemMultiPart; import reborncore.mcmultipart.item.ItemMultiPart;
import reborncore.mcmultipart.multipart.IMultipart; import reborncore.mcmultipart.multipart.IMultipart;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -59,10 +62,10 @@ public class ItemCables extends ItemMultiPart implements ITexturedItem {
return super.getUnlocalizedName() + "." + EnumCableType.values()[meta]; return super.getUnlocalizedName() + "." + EnumCableType.values()[meta];
} }
// Adds Dusts SubItems To Creative Tab @Override
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (int meta = 0; meta < EnumCableType.values().length; ++meta) { 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 @Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) { public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
EnumCableType type = EnumCableType.values()[stack.getItemDamage()]; 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) { if (type.canKill) {
tooltip.add(TextFormatting.RED + I18n.translateToLocal("desc.uninsulatedCable")); tooltip.add(TextFormatting.RED + I18n.translateToLocal("desc.uninsulatedCable"));
} }
tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.tier") + TextFormatting.LIGHT_PURPLE + type.tier);
} }
} }

View file

@ -925,7 +925,7 @@ Cable.glassFiberCable.name=Glass Fiber Cable
Cable.tinCable.name=Tin Cable Cable.tinCable.name=Tin Cable
desc.uninsulatedCable=Damages Entities! desc.uninsulatedCable=Damages Entities!
desc.euTransfer=EU Transfer: desc.transfer=Energy Transfer:
desc.tier=Tier: desc.tier=Tier: