Skip to content

Commit

Permalink
Applied the formatting and cleanup settings
Browse files Browse the repository at this point in the history
  • Loading branch information
CraftedMods committed Oct 7, 2018
1 parent aed730a commit 4f0b5c1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
4 changes: 4 additions & 0 deletions src/main/java/pvpmode/ChatUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ public static void postLocalChatMessages (ICommandSender recipient, EnumChatForm
}
}
if (root != null)
{
recipient.addChatMessage (root);
}
}
}
}
Expand Down Expand Up @@ -134,7 +136,9 @@ public static void postGlobalChatMessages (EnumChatFormatting color,
}
}
if (root != null)
{
PvPMode.cfg.sendChatMsg (root);
}
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/pvpmode/PvPEventHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.CommandEvent;
import net.minecraftforge.event.entity.living.*;
import net.minecraftforge.event.entity.player.*;
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
import pvpmode.compatibility.events.*;
import pvpmode.compatibility.events.PartialItemDropEvent.Drop.Action;
import pvpmode.compatibility.events.PartialItemDropEvent.EnumInventory;
Expand Down Expand Up @@ -531,14 +531,14 @@ public void onPartialItemLoss (PartialItemLossEvent event)
event.setCanceled (PvPMode.soulboundItemsEnabled && PvPUtils.isSoulbound (event.getStack ()));
}

// @SubscribeEvent
// public void onItemTooltip (ItemTooltipEvent event)
// {
// if (PvPUtils.isSoulbound (event.itemStack) && PvPMode.soulboundItemsEnabled)
// {
// event.toolTip.add (PvPMode.soulboundTooltip);
// }
// }TODO: clientside mod
// @SubscribeEvent
// public void onItemTooltip (ItemTooltipEvent event)
// {
// if (PvPUtils.isSoulbound (event.itemStack) && PvPMode.soulboundItemsEnabled)
// {
// event.toolTip.add (PvPMode.soulboundTooltip);
// }
// }TODO: clientside mod

public static void init ()
{
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/pvpmode/command/PvPCommandHelp.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ public void processCommand (ICommandSender sender, String[] args)
postShortCommandHelp (sender, PvPMode.pvpadminCommandInstance);
postShortCommandHelp (sender, PvPMode.pvpconfigCommandInstance);
if (PvPMode.soulboundItemsEnabled)
{
postShortCommandHelp (sender, PvPMode.soulboundCommandInstance);
}
ChatUtils.green (sender, "-------------------------");
}
else
Expand Down Expand Up @@ -181,7 +183,9 @@ public List<?> addTabCompletionOptions (ICommandSender sender, String[] args)
{"pvp", "pvpadmin", "pvplist", "pvphelp",
"pvpconfig"};
if (PvPMode.soulboundItemsEnabled)
{
commands = ArrayUtils.add (commands, "soulbound");
}
return getListOfStringsMatchingLastWord (args, commands);
}
return null;
Expand Down

0 comments on commit 4f0b5c1

Please sign in to comment.