TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-12-28 11:04:21 +00:00
Code Issues Projects Releases Wiki Activity

A much needed update

Browse source
This commit is contained in:
Telesphoreo 2020-08-13 23:39:44 -05:00
parent d157ae7eab
commit bb0e70a4a7
16 changed files with 243 additions and 228 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Essentials/pom.xml
View file

@ -14,14 +14,6 @@
<build>
<finalName>EssentialsX-${full.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@ -111,16 +103,6 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.rayzr522</groupId>
<artifactId>jsonmessage</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.github.TFPatches</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>development-SNAPSHOT</version>
</dependency>
<!--<dependency>
<groupId>net.ess3</groupId>
<artifactId>1_8Provider</artifactId>
<version>2.18.0</version>
@ -131,6 +113,6 @@
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>-->
</dependency>
</dependencies>
</project>
</project>

12
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View file

@ -1045,6 +1045,18 @@ public class OfflinePlayer implements Player {
return 0;
}
@Override
public boolean hasDiscoveredRecipe(NamespacedKey namespacedKey)
{
return false;
}
@Override
public Set<NamespacedKey> getDiscoveredRecipes()
{
return null;
}
@Override
public boolean hasLineOfSight(Entity entity) {
return false;

2
Essentials/src/com/earth2me/essentials/TFMHandler.java
View file

@ -64,7 +64,7 @@ public class TFMHandler
{
getTFM();
}
return AdminList.vanished.contains(player.getName());
return getTFM().al.isVanished(player);
}
public void warning(String warning)

4
Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java
View file

@ -14,7 +14,7 @@ public class Commandenderchest extends EssentialsCommand {
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
User target = user;
if (args.length > 0 && user.isAuthorized("essentials.enderchest.others")) {
if (args.length > 0 && getTFMHandler().isAdmin(user)) {
target = getPlayer(server, user, args, 0);
}
@ -25,7 +25,7 @@ public class Commandenderchest extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.enderchest.others")) {
if (args.length == 1 && getTFMHandler().isAdmin(user)) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

5
Essentials/src/com/earth2me/essentials/commands/Commandhat.java
View file

@ -59,11 +59,6 @@ public class Commandhat extends EssentialsCommand {
return;
}
if (user.isAuthorized("essentials.hat.prevent-type." + hand.getType().name().toLowerCase())) {
user.sendMessage(tl("hatFail"));
return;
}
if (hand.getType().getMaxDurability() != 0) {
user.sendMessage(tl("hatArmor"));
return;

53
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file

@ -6,41 +6,50 @@ import com.earth2me.essentials.User;
import com.earth2me.essentials.messaging.IMessageRecipient;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.FormatUtil;
import org.bukkit.Server;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import static com.earth2me.essentials.I18n.tl;
public class Commandmsg extends EssentialsLoopCommand {
public Commandmsg() {
public class Commandmsg extends EssentialsLoopCommand
{
public Commandmsg()
{
super("msg");
}
@Override
public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
if (args.length < 2) {
public void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception
{
if (args.length < 2)
{
throw new NotEnoughArgumentsException();
}
String message = getFinalArg(args, 1);
boolean canWildcard = sender.isAuthorized("essentials.msg.multiple", ess);
if (sender.isPlayer()) {
boolean canWildcard = getTFMHandler().isAdmin(sender.getPlayer());
if (sender.isPlayer())
{
User user = ess.getUser(sender.getPlayer());
if (user.isMuted()) {
if (user.isMuted())
{
String dateDiff = user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : null;
if (dateDiff == null) {
if (dateDiff == null)
{
throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReason", user.getMuteReason()) : tl("voiceSilenced"));
}
throw new Exception(user.hasMuteReason() ? tl("voiceSilencedReasonTime", dateDiff, user.getMuteReason()) : tl("voiceSilencedTime", dateDiff));
}
message = FormatUtil.formatMessage(user, "essentials.msg", message);
} else {
}
else
{
message = FormatUtil.replaceFormat(message);
}
// Sending messages to console
if (args[0].equalsIgnoreCase(Console.NAME)) {
if (args[0].equalsIgnoreCase(Console.NAME))
{
IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getInstance();
messageSender.sendMessage(Console.getInstance(), message);
return;
@ -50,16 +59,26 @@ public class Commandmsg extends EssentialsLoopCommand {
}
@Override
protected void updatePlayer(final Server server, final CommandSource sender, final User messageReceiver, final String[] args) {
protected void updatePlayer(final Server server, final CommandSource sender, final User messageReceiver, final String[] args)
{
IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getInstance();
if (getTFMHandler().isVanished(messageReceiver) && !getTFMHandler().isAdmin(sender.getSender()))
{
messageSender.sendMessage(ChatColor.RED + "Error: " + ChatColor.RED + "Player not found.");
return;
}
messageSender.sendMessage(messageReceiver, args[0]); // args[0] is the message.
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args)
{
if (args.length == 1)
{
return getPlayers(server, sender);
} else {
}
else
{
return null; // It's a chat message, use the default chat handler
}
}

4
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View file

@ -30,7 +30,7 @@ public class Commandnick extends EssentialsLoopCommand {
throw new Exception(tl("nickDisplayName"));
}
if (args.length > 1 && user.isAuthorized("essentials.nick.others")) {
if (args.length > 1 && getTFMHandler().isAdmin(user)) {
loopOfflinePlayers(server, user.getSource(), false, true, args[0], formatNickname(user, args[1]).split(" "));
user.sendMessage(tl("nickChanged"));
} else {
@ -124,7 +124,7 @@ public class Commandnick extends EssentialsLoopCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.nick.others")) {
if (args.length == 1 && getTFMHandler().isAdmin(user)) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

4
Essentials/src/com/earth2me/essentials/commands/Commandptime.java
View file

@ -48,7 +48,7 @@ public class Commandptime extends EssentialsLoopCommand {
}
}
if (args.length > 1 && !sender.isAuthorized("essentials.ptime.others", ess) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
if (args.length > 1 && !getTFMHandler().isAdmin(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
sender.sendMessage(tl("pTimeOthersPermission"));
return;
}
@ -120,7 +120,7 @@ public class Commandptime extends EssentialsLoopCommand {
if (args.length == 1) {
return Lists.newArrayList("get", "reset", "sunrise", "day", "morning", "noon", "afternoon", "sunset", "night", "midnight");
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || user.isAuthorized("essentials.ptime.others"))) {
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isAdmin(user))) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

4
Essentials/src/com/earth2me/essentials/commands/Commandpweather.java
View file

@ -54,7 +54,7 @@ public class Commandpweather extends EssentialsLoopCommand {
}
}
if (args.length > 1 && !sender.isAuthorized("essentials.pweather.others", ess) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
if (args.length > 1 && !getTFMHandler().isAdmin(sender.getPlayer()) && !args[1].equalsIgnoreCase(sender.getSelfSelector())) {
sender.sendMessage(tl("pWeatherOthersPermission"));
return;
}
@ -102,7 +102,7 @@ public class Commandpweather extends EssentialsLoopCommand {
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1) {
return Lists.newArrayList("get", "reset", "storm", "sun");
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || user.isAuthorized("essentials.pweather.others"))) {
} else if (args.length == 2 && (getAliases.contains(args[0]) || user == null || getTFMHandler().isAdmin(user))) {
return getPlayers(server, user);
} else {
return Collections.emptyList();

6
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View file

@ -28,9 +28,9 @@ public class Commandseen extends EssentialsCommand {
@Override
protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
boolean showBan = sender.isAuthorized("essentials.seen.banreason", ess);
boolean showIp = sender.isAuthorized("essentials.seen.ip", ess);
boolean showLocation = sender.isAuthorized("essentials.seen.location", ess);
boolean showBan = getTFMHandler().isAdmin(sender.getPlayer());
boolean showIp = getTFMHandler().isAdmin(sender.getPlayer());
boolean showLocation = getTFMHandler().isAdmin(sender.getPlayer());
if (args.length < 1) {
throw new NotEnoughArgumentsException();
}

4
Essentials/src/com/earth2me/essentials/commands/Commandspeed.java
View file

@ -44,7 +44,7 @@ public class Commandspeed extends EssentialsCommand {
} else {
isFly = flyPermCheck(user, isFlyMode(args[0]));
speed = getMoveSpeed(args[1]);
if (args.length > 2 && user.isAuthorized("essentials.speed.others")) {
if (args.length > 2 && getTFMHandler().isAdmin(user)) {
if (args[2].trim().length() < 2) {
throw new PlayerNotFoundException();
}
@ -141,7 +141,7 @@ public class Commandspeed extends EssentialsCommand {
return types;
} else if (args.length == 2) {
return speeds;
} else if (args.length == 3 && sender.isAuthorized("essentials.speed.others", ess)) {
} else if (args.length == 3 && getTFMHandler().isAdmin(sender.getPlayer())) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

3
Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
View file

@ -25,6 +25,9 @@ public class Commandtpahere extends EssentialsCommand {
if (user.getName().equalsIgnoreCase(player.getName())) {
throw new NotEnoughArgumentsException();
}
if (getTFMHandler().isVanished(player) && !getTFMHandler().isAdmin(user)) {
throw new PlayerNotFoundException();
}
if (!player.isAuthorized("essentials.tpaccept")) {
throw new Exception(tl("teleportNoAcceptPermission", player.getDisplayName()));
}

24
Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
View file

@ -636,6 +636,18 @@ public class FakeWorld implements World {
}
@Override
public long getTicksPerWaterAmbientSpawns()
{
return 0;
}
@Override
public void setTicksPerWaterAmbientSpawns(int i)
{
}
@Override
public long getTicksPerAmbientSpawns() {
return 0;
@ -726,6 +738,18 @@ public class FakeWorld implements World {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public int getWaterAmbientSpawnLimit()
{
return 0;
}
@Override
public void setWaterAmbientSpawnLimit(int i)
{
}
@Override
public Entity spawnEntity(Location lctn, EntityType et) {
throw new UnsupportedOperationException("Not supported yet.");

280
Essentials/src/plugin.yml
View file

@ -13,18 +13,18 @@ commands:
description: Marks you as away-from-keyboard.
usage: /<command> [player/message...]
aliases: [eafk,away,eaway]
antioch:
description: 'A little surprise for operators.'
usage: /<command> [message]
aliases: [eantioch,grenade,egrenade,tnt,etnt]
# antioch:
# description: 'A little surprise for operators.'
# usage: /<command> [message]
# aliases: [eantioch,grenade,egrenade,tnt,etnt]
back:
description: Teleports you to your location prior to tp/spawn/warp.
usage: /<command> [player]
aliases: [eback,return,ereturn]
backup:
description: Runs the backup if configured.
usage: /<command>
aliases: [ebackup]
# backup:
# description: Runs the backup if configured.
# usage: /<command>
# aliases: [ebackup]
balance:
description: States the current balance of a player.
usage: /<command> [player]
@ -33,14 +33,14 @@ commands:
description: Gets the top balance values.
usage: /<command> <page>
aliases: [ebalancetop,baltop,ebaltop]
ban:
description: Bans a player.
usage: /<command> <player> [reason]
aliases: [eban]
banip:
description: Bans an IP address.
usage: /<command> <address>
aliases: [ebanip]
# ban:
# description: Bans a player.
# usage: /<command> <player> [reason]
# aliases: [eban]
# banip:
# description: Bans an IP address.
# usage: /<command> <address>
# aliases: [ebanip]
beezooka:
description: Throw an exploding bee at your opponent.
usage: /<command>
@ -53,14 +53,14 @@ commands:
description: Breaks the block you are looking at.
usage: /<command>
aliases: [ebreak]
broadcast:
description: Broadcasts a message to the entire server.
usage: /<command> <msg>
aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout]
broadcastworld:
description: Broadcasts a message to a world.
usage: /<command> <world> <msg>
aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld]
# broadcast:
# description: Broadcasts a message to the entire server.
# usage: /<command> <msg>
# aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout]
# broadcastworld:
# description: Broadcasts a message to a world.
# usage: /<command> <world> <msg>
# aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld]
bigtree:
description: Spawn a big tree where you are looking.
usage: /<command> <tree|redwood|jungle|darkoak>
@ -69,14 +69,14 @@ commands:
description: Set a player on fire.
usage: /<command> <player> <seconds>
aliases: [eburn]
clearinventory:
description: Clear all items in your inventory.
usage: /<command> [player|*] [item[:<data>]|*|**] [amount]
aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory]
clearinventoryconfirmtoggle:
description: Toggles whether you are prompted to confirm inventory clears.
usage: /<command>
aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm]
# clearinventory:
# description: Clear all items in your inventory.
# usage: /<command> [player|*] [item[:<data>]|*|**] [amount]
# aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory]
# clearinventoryconfirmtoggle:
# description: Toggles whether you are prompted to confirm inventory clears.
# usage: /<command>
# aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm]
condense:
description: Condenses items into a more compact blocks.
usage: /<command> [<itemname>|<id>|hand|inventory]
@ -96,10 +96,10 @@ commands:
description: Removes a home.
usage: /<command> [player:]<name>
aliases: [edelhome,remhome,eremhome,rmhome,ermhome]
deljail:
description: Removes a jail.
usage: /<command> <jailname>
aliases: [edeljail,remjail,eremjail,rmjail,ermjail]
# deljail:
# description: Removes a jail.
# usage: /<command> <jailname>
# aliases: [edeljail,remjail,eremjail,rmjail,ermjail]
delkit:
description: Deletes the specified kit.
usage: /<command> <kit>
@ -120,10 +120,10 @@ commands:
description: Manages the server economy.
usage: /<command> <give|take|set|reset> <player> <amount>
aliases: [eeco,economy,eeconomy]
enchant:
description: Enchants the item the user is holding.
usage: /<command> <enchantmentname> [level]
aliases: [eenchant,enchantment,eenchantment]
# enchant:
# description: Enchants the item the user is holding.
# usage: /<command> <enchantmentname> [level]
# aliases: [eenchant,enchantment,eenchantment]
enderchest:
description: Lets you see inside an enderchest.
usage: /<command> [player]
@ -148,18 +148,18 @@ commands:
description: Take off, and soar!
usage: /<command> [player] [on|off]
aliases: [efly]
fireball:
description: Throw a fireball or other assorted projectiles.
usage: /<command> [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed]
aliases: [efireball,fireentity,efireentity,fireskull,efireskull]
# fireball:
# description: Throw a fireball or other assorted projectiles.
# usage: /<command> [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed]
# aliases: [efireball,fireentity,efireentity,fireskull,efireskull]
firework:
description: Allows you to modify a stack of fireworks.
usage: /<command> <<meta param>|power [amount]|clear|fire [amount]>
aliases: [efirework]
gamemode:
description: Change player gamemode.
usage: /<command> <survival|creative|adventure|spectator> [player]
aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator]
# gamemode:
# description: Change player gamemode.
# usage: /<command> <survival|creative|adventure|spectator> [player]
# aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator]
gc:
description: Reports memory, uptime and tick info.
usage: /<command> [all]
@ -188,10 +188,10 @@ commands:
description: Views a list of available commands.
usage: /<command> [search term] [page]
aliases: [ehelp]
helpop:
description: Message online admins.
usage: /<command> <message>
aliases: [ac,eac,amsg,eamsg,ehelpop]
# helpop:
# description: Message online admins.
# usage: /<command> <message>
# aliases: [ac,eac,amsg,eamsg,ehelpop]
home:
description: Teleport to your home.
usage: /<command> [player:][name]
@ -224,22 +224,22 @@ commands:
description: Names an item.
usage: /<command> [name]
aliases: [iname, einame, eitemname, itemrename, irename, eitemrename, eirename]
jails:
description: List all jails.
usage: /<command>
aliases: [ejails]
# jails:
# description: List all jails.
# usage: /<command>
# aliases: [ejails]
jump:
description: Jumps to the nearest block in the line of sight.
usage: /<command>
aliases: [j,ej,ejump,jumpto,ejumpto]
kick:
description: Kicks a specified player with a reason.
usage: /<command> <player> [reason]
aliases: [ekick]
kickall:
description: Kicks all players off the server except the issuer.
usage: /<command> [reason]
aliases: [ekickall]
# kick:
# description: Kicks a specified player with a reason.
# usage: /<command> <player> [reason]
# aliases: [ekick]
# kickall:
# description: Kicks all players off the server except the issuer.
# usage: /<command> [reason]
# aliases: [ekickall]
kill:
description: Kills specified player.
usage: /<command> <player>
@ -252,14 +252,14 @@ commands:
description: Throw an exploding kitten at your opponent.
usage: /<command>
aliases: [ekittycannon]
lightning:
description: The power of Thor. Strike at cursor or player.
usage: /<command> [player] [power]
aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor]
list:
description: List all online players.
usage: /<command> [group]
aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho]
# lightning:
# description: The power of Thor. Strike at cursor or player.
# usage: /<command> [player] [power]
# aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor]
# list:
# description: List all online players.
# usage: /<command> [group]
# aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho]
mail:
description: Manages inter-player, intra-server mail.
usage: /<command> [read|clear|send [to] [message]|sendall [message]]
@ -284,10 +284,10 @@ commands:
description: Blocks receiving all private messages.
usage: /<command> [player] [on|off]
aliases: [emsgtoggle]
mute:
description: Mutes or unmutes a player.
usage: /<command> <player> [datediff] [reason]
aliases: [emute,silence,esilence]
# mute:
# description: Mutes or unmutes a player.
# usage: /<command> <player> [datediff] [reason]
# aliases: [emute,silence,esilence]
near:
description: Lists the players near by or around a player.
usage: /<command> [playername] [radius]
@ -296,10 +296,10 @@ commands:
description: Change your nickname or that of another player.
usage: /<command> [player] <nickname|off>
aliases: [enick,nickname,enickname]
nuke:
description: May death rain upon them.
usage: /<command> [player]
aliases: [enuke]
# nuke:
# description: May death rain upon them.
# usage: /<command> [player]
# aliases: [enuke]
tpoffline:
description: Teleport to a player's last known logout location
usage: /<command> <player>
@ -320,18 +320,18 @@ commands:
description: Pong!
usage: /<command>
aliases: [echo,eecho,eping,pong,epong]
potion:
description: Adds custom potion effects to a potion.
usage: /<command> <clear|apply|effect:<effect> power:<power> duration:<duration>>
aliases: [epotion,elixer,eelixer]
powertool:
description: Assigns a command to the item in hand.
usage: /<command> [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player.
aliases: [epowertool,pt,ept]
powertooltoggle:
description: Enables or disables all current powertools.
usage: /<command>
aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle]
# potion:
# description: Adds custom potion effects to a potion.
# usage: /<command> <clear|apply|effect:<effect> power:<power> duration:<duration>>
# aliases: [epotion,elixer,eelixer]
# powertool:
# description: Assigns a command to the item in hand.
# usage: /<command> [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player.
# aliases: [epowertool,pt,ept]
# powertooltoggle:
# description: Enables or disables all current powertools.
# usage: /<command>
# aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle]
ptime:
description: Adjust player's client time. Add @ prefix to fix.
usage: /<command> [list|reset|day|night|dawn|17:30|4pm|4000ticks] [player|*]
@ -384,14 +384,14 @@ commands:
description: Set your home to your current location.
usage: /<command> [[player:]name]
aliases: [esethome,createhome,ecreatehome]
setjail:
description: Creates a jail where you specified named [jailname].
usage: /<command> <jailname>
aliases: [esetjail,createjail,ecreatejail]
settpr:
description: Set the random teleport location and parameters.
usage: /<command> [center|minrange|maxrange] [value]
aliases: [esettpr, settprandom, esettprandom]
# setjail:
# description: Creates a jail where you specified named [jailname].
# usage: /<command> <jailname>
# aliases: [esetjail,createjail,ecreatejail]
# settpr:
# description: Set the random teleport location and parameters.
# usage: /<command> [center|minrange|maxrange] [value]
# aliases: [esettpr, settprandom, esettprandom]
setwarp:
description: Creates a new warp.
usage: /<command> <warp>
@ -428,34 +428,34 @@ commands:
description: Change your speed limits.
usage: /<command> [type] <speed> [player]
aliases: [flyspeed,eflyspeed,fspeed,efspeed,espeed,walkspeed,ewalkspeed,wspeed,ewspeed]
sudo:
description: Make another user perform a command.
usage: /<command> <player> <command [args]>
aliases: [esudo]
# sudo:
# description: Make another user perform a command.
# usage: /<command> <player> <command [args]>
# aliases: [esudo]
suicide:
description: Causes you to perish.
usage: /<command>
aliases: [esuicide]
tempban:
description: Temporary ban a user.
usage: /<command> <playername> <datediff> <reason>
aliases: [etempban]
tempbanip:
description: Temporarily ban an IP Address.
usage: /<command> <playername> <datediff> <reason>
aliases: [etempbanip]
# tempban:
# description: Temporary ban a user.
# usage: /<command> <playername> <datediff> <reason>
# aliases: [etempban]
# tempbanip:
# description: Temporarily ban an IP Address.
# usage: /<command> <playername> <datediff> <reason>
# aliases: [etempbanip]
thunder:
description: Enable/disable thunder.
usage: /<command> <true/false> [duration]
aliases: [ethunder]
time:
description: Display/Change the world time. Defaults to current world.
usage: /<command> [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all]
aliases: [day,eday,night,enight,etime]
togglejail:
description: Jails/Unjails a player, TPs them to the jail specified.
usage: /<command> <player> <jailname> [datediff]
aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail]
# time:
# description: Display/Change the world time. Defaults to current world.
# usage: /<command> [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all]
# aliases: [day,eday,night,enight,etime]
# togglejail:
# description: Jails/Unjails a player, TPs them to the jail specified.
# usage: /<command> <player> <jailname> [datediff]
# aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail]
top:
description: Teleport to the highest block at your current position.
usage: /<command>
@ -512,10 +512,10 @@ commands:
description: Teleport to coordinates.
usage: /<command> <x> <y> <z> [yaw] [pitch] [world]
aliases: [etppos]
tpr:
description: Teleport randomly.
usage: /<command>
aliases: [etpr, tprandom, etprandom]
# tpr:
# description: Teleport randomly.
# usage: /<command>
# aliases: [etpr, tprandom, etprandom]
tptoggle:
description: Blocks all forms of teleportation.
usage: /<command> [player] [on|off]
@ -524,30 +524,30 @@ commands:
description: Spawn a tree where you are looking.
usage: /<command> <tree|birch|redwood|redmushroom|brownmushroom|jungle|junglebush|swamp>
aliases: [etree]
unban:
description: Unbans the specified player.
usage: /<command> <player>
aliases: [pardon,eunban,epardon]
unbanip:
description: Unbans the specified IP address.
usage: /<command> <address>
aliases: [eunbanip,pardonip,epardonip]
# unban:
# description: Unbans the specified player.
# usage: /<command> <player>
# aliases: [pardon,eunban,epardon]
# unbanip:
# description: Unbans the specified IP address.
# usage: /<command> <address>
# aliases: [eunbanip,pardonip,epardonip]
unlimited:
description: Allows the unlimited placing of items.
usage: /<command> <list|item|clear> [player]
aliases: [eunlimited,ul,unl,eul,eunl]
vanish:
description: Hide yourself from other players.
usage: /<command> [player] [on|off]
aliases: [v,ev,evanish]
# vanish:
# description: Hide yourself from other players.
# usage: /<command> [player] [on|off]
# aliases: [v,ev,evanish]
warp:
description: List all warps or warp to the specified location.
usage: /<command> <pagenumber|warp> [player]
aliases: [ewarp,warps,ewarps]
weather:
description: Sets the weather.
usage: /<command> <storm/sun> [duration]
aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather]
# weather:
# description: Sets the weather.
# usage: /<command> <storm/sun> [duration]
# aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather]
whois:
description: Determine the username behind a nickname.
usage: /<command> <nickname>

1
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View file

@ -2,6 +2,7 @@ package com.earth2me.essentials.spawn;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.Console;
import com.earth2me.essentials.TFMHandler;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.commands.EssentialsCommand;

43
pom.xml
View file

@ -23,10 +23,6 @@
</scm>
<repositories>
<repository>
<id>jitpack</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>ess-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
@ -40,8 +36,8 @@
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>rayzr-repo</id>
<url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
<id>jitpack</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
@ -51,6 +47,7 @@
<module>providers/BaseProviders</module>
<module>providers/NMSReflectionProvider</module>
<module>providers/PaperProvider</module>
<module>providers/1_8Provider</module>
</modules>
<dependencies>
@ -72,11 +69,18 @@
<version>3.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.TFPatches</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>development-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>clean install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -100,36 +104,11 @@
<artifactId>EssentialsX</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXAntiBuild</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXChat</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXGeoIP</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXProtect</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXSpawn</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>EssentialsXXMPP</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
<inherited>false</inherited>
@ -275,4 +254,4 @@
<full.version>${release.version}.${build.version}</full.version>
</properties>
</project>
</project>