AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-29 11:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forgot class paths, remove things lombok covers, and optimize imports

Browse Source
This commit is contained in:
ZeroEpoch1969
2018-07-31 00:01:29 -07:00
parent 1f9078b702
commit 2716e2500b
126 changed files with 285 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
View File

@ -2,12 +2,7 @@ package me.totalfreedom.totalfreedommod.banning;
import com.google.common.collect.Lists;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.*;
import lombok.Getter;
import lombok.Setter;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -100,7 +95,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
public static Ban forPlayerName(String player, CommandSender by, Date expiry, String reason)
{
return new Ban(player,
(String[]) null,
(String[])null,
by.getName(),
expiry,
reason);
@ -156,56 +151,6 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
return expiryUnix > 0;
}
public String getUsername()
{
return this.username;
}
public void setUsername(final String username)
{
this.username = username;
}
public List<String> getIps()
{
return this.ips;
}
public String getBy()
{
return this.by;
}
public void setBy(final String by)
{
this.by = by;
}
public String getReason()
{
return this.reason;
}
public void setReason(final String reason)
{
this.reason = reason;
}
public long getExpiryUnix()
{
return this.expiryUnix;
}
public void setExpiryUnix(final long expiryUnix)
{
this.expiryUnix = expiryUnix;
}
public Date getExpiryDate()
{
return FUtil.getUnixDate(expiryUnix);
}
public boolean isExpired()
{
return hasExpiry() && expiryUnix < FUtil.getUnixTime();
@ -253,7 +198,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
return false;
}
final Ban ban = (Ban) object;
final Ban ban = (Ban)object;
if (hasIps() != ban.hasIps()
|| hasUsername() != hasUsername())
{

9
src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
View File

@ -3,12 +3,7 @@ package me.totalfreedom.totalfreedommod.banning;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -74,7 +69,7 @@ public class BanManager extends FreedomService
// Load unbannable usernames
unbannableUsernames.clear();
unbannableUsernames.addAll((Collection<? extends String>) ConfigEntry.FAMOUS_PLAYERS.getList());
unbannableUsernames.addAll((Collection<? extends String>)ConfigEntry.FAMOUS_PLAYERS.getList());
FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
}