diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-11 04:14:27 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-04-11 04:14:27 +1000 |
| commit | be88e9009e66ef27d9bccd27cce7fd13ae3b06cd (patch) | |
| tree | 9dea1b1244728479f95e8b41840ca8fd79d99dcb /src/Java/gtPlusPlus/core/item/bauble | |
| parent | 3b7cff8412af5afbf99bfd40fee1193a6cd8c400 (diff) | |
| download | GT5-Unofficial-be88e9009e66ef27d9bccd27cce7fd13ae3b06cd.tar.gz GT5-Unofficial-be88e9009e66ef27d9bccd27cce7fd13ae3b06cd.tar.bz2 GT5-Unofficial-be88e9009e66ef27d9bccd27cce7fd13ae3b06cd.zip | |
+ Added the ASM segment for IC2 Hazmat.
- Disabled most Hazmat logging.
% Mild adjustment to formatting for mob types in MK Baubles tooltips.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/bauble')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java index 2cffb8737f..aa89ff1627 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java +++ b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java @@ -11,6 +11,7 @@ import gtPlusPlus.api.objects.minecraft.AABB; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import ic2.api.item.ElectricItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -85,12 +86,12 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble { String aEUT = aEU + "/t"; list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN + aString2 + " " + (int) getTransferLimit(stack) + aEUT + aString3 + list.add(EnumChatFormatting.GREEN + aString2 + " " + (int) getTransferLimit(stack) + aEUT + " " + aString3 + EnumChatFormatting.GRAY); list.add(""); list.add("" + EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY); for (Class cz : mTargets) { - list.add("- " + EnumChatFormatting.DARK_GREEN + cz.getSimpleName() + EnumChatFormatting.GRAY); + list.add("- " + EnumChatFormatting.DARK_GREEN + cz.getSimpleName().replace("Entity", "") + EnumChatFormatting.GRAY); } super.addInformation(stack, aPlayer, list, bool); @@ -151,6 +152,7 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble { long aEuUsage = (long) (aEntHealthPerc * 50 * aEntMaxHealth); if (this.discharge(aBaubleStack, aEuUsage, mTier, true, false, false) > 0) { aClosest.setDead(); + PlayerUtils.messagePlayer(aPlayer, "Removed 1x "+aClosest.getCommandSenderName()); break; } } else { |