Skip to content

Commit b0fcff5

Browse files
colbster937colbster937
committed
start on subscriptions
1 parent 9b6bc94 commit b0fcff5

39 files changed

+241
-178
lines changed

‎src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/main/java/xyz/webmc/originblacklist/bukkit/BukkitMetricsAdapter.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package xyz.webmc.originblacklist.bukkit;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter;
5-
63
import org.bstats.charts.CustomChart;
4+
5+
import xyz.webmc.originblacklist.core.OriginBlacklist;
6+
import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter;
7+
78
import org.bstats.bukkit.Metrics;
89

910
public final class BukkitMetricsAdapter extends GenericMetricsAdapter {
10-
private final OriginBlacklistBukkit plugin;
11+
private final OriginBlacklistBukkitPlugin plugin;
1112
private Metrics metrics;
1213

13-
public BukkitMetricsAdapter(final OriginBlacklistBukkit plugin) {
14+
public BukkitMetricsAdapter(final OriginBlacklistBukkitPlugin plugin) {
1415
super();
1516
this.plugin = plugin;
1617
}

src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java renamed to src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkitPlugin.java

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package xyz.webmc.originblacklist.bukkit;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
5-
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
6-
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
7-
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
8-
import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
9-
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
10-
import xyz.webmc.originblacklist.base.util.OPlayer;
113
import xyz.webmc.originblacklist.bukkit.command.OriginBlacklistCommandBukkit;
4+
import xyz.webmc.originblacklist.core.OriginBlacklist;
5+
import xyz.webmc.originblacklist.core.enums.EnumConnectionType;
6+
import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent;
7+
import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent;
8+
import xyz.webmc.originblacklist.core.logger.JavaLogger;
9+
import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin;
10+
import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException;
11+
import xyz.webmc.originblacklist.core.util.OPlayer;
1212

1313
import java.awt.image.BufferedImage;
1414
import java.io.ByteArrayInputStream;
@@ -41,10 +41,11 @@
4141
import org.semver4j.Semver;
4242

4343
@SuppressWarnings({ "rawtypes" })
44-
public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
44+
public final class OriginBlacklistBukkitPlugin extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
4545
private boolean papiPlaceholdersEnabled;
4646
private Object papi;
4747
private OriginBlacklist blacklist;
48+
private JavaLogger logger;
4849
private Metrics metrics;
4950

5051
private CachedServerIcon iconCache;
@@ -71,6 +72,7 @@ public final void onEnable() {
7172
} else {
7273
this.papi = null;
7374
}
75+
this.logger = new JavaLogger(this.getLogger());
7476
this.blacklist = new OriginBlacklist(this);
7577
this.getCommand("originblacklist").setExecutor(new OriginBlacklistCommandBukkit(this.blacklist));
7678
this.getServer().getPluginManager().registerEvents(this, this);
@@ -147,18 +149,8 @@ public final IEaglerXServerAPI getEaglerAPI() {
147149
}
148150

149151
@Override
150-
public final void log(final EnumLogLevel level, final String txt) {
151-
if (level == EnumLogLevel.WARN) {
152-
this.getLogger().warning(txt);
153-
} else if (level == EnumLogLevel.ERROR) {
154-
this.getLogger().severe(txt);
155-
} else if (level == EnumLogLevel.DEBUG) {
156-
if (this.blacklist != null && this.blacklist.isDebugEnabled()) {
157-
this.getLogger().info(txt);
158-
}
159-
} else {
160-
this.getLogger().info(txt);
161-
}
152+
public final JavaLogger getTheLogger() {
153+
return this.logger;
162154
}
163155

164156
@Override

‎src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package xyz.webmc.originblacklist.bukkit.command;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.command.CommandContext;
3+
import xyz.webmc.originblacklist.core.OriginBlacklist;
4+
import xyz.webmc.originblacklist.core.command.CommandContext;
55

66
import org.bukkit.command.CommandSender;
77

‎src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package xyz.webmc.originblacklist.bukkit.command;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand;
3+
import xyz.webmc.originblacklist.core.OriginBlacklist;
4+
import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand;
55

66
import java.util.List;
77

‎src/main/java/xyz/webmc/originblacklist/bungee/BungeeMetricsAdapter.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package xyz.webmc.originblacklist.bungee;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter;
5-
63
import org.bstats.charts.CustomChart;
4+
5+
import xyz.webmc.originblacklist.core.OriginBlacklist;
6+
import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter;
7+
78
import org.bstats.bungeecord.Metrics;
89

910
public final class BungeeMetricsAdapter extends GenericMetricsAdapter {
10-
private final OriginBlacklistBungee plugin;
11+
private final OriginBlacklistBungeePlugin plugin;
1112
private Metrics metrics;
1213

13-
public BungeeMetricsAdapter(final OriginBlacklistBungee plugin) {
14+
public BungeeMetricsAdapter(final OriginBlacklistBungeePlugin plugin) {
1415
super();
1516
this.plugin = plugin;
1617
}

src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java renamed to src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungeePlugin.java

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package xyz.webmc.originblacklist.bungee;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
5-
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
6-
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
7-
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
8-
import xyz.webmc.originblacklist.base.util.EaglerEventPriority;
9-
import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
10-
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
11-
import xyz.webmc.originblacklist.base.util.OPlayer;
123
import xyz.webmc.originblacklist.bungee.command.OriginBlacklistCommandBungee;
4+
import xyz.webmc.originblacklist.core.OriginBlacklist;
5+
import xyz.webmc.originblacklist.core.enums.EnumConnectionType;
6+
import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent;
7+
import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent;
8+
import xyz.webmc.originblacklist.core.logger.JavaLogger;
9+
import xyz.webmc.originblacklist.core.util.EaglerEventPriority;
10+
import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin;
11+
import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException;
12+
import xyz.webmc.originblacklist.core.util.OPlayer;
1313

1414
import java.net.InetSocketAddress;
1515
import java.nio.file.Path;
@@ -35,11 +35,12 @@
3535
import org.semver4j.Semver;
3636

3737
@SuppressWarnings({ "deprecation", "rawtypes" })
38-
public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin {
38+
public final class OriginBlacklistBungeePlugin extends Plugin implements Listener, IOriginBlacklistPlugin {
3939
private ProxyServer proxy;
4040
private boolean papiPlaceholdersEnabled;
4141
private Object papi;
4242
private OriginBlacklist blacklist;
43+
private JavaLogger logger;
4344

4445
@Override
4546
public final void onEnable() {
@@ -65,6 +66,7 @@ public final void onEnable() {
6566
} else {
6667
this.papi = null;
6768
}
69+
this.logger = new JavaLogger(this.getLogger());
6870
this.blacklist = new OriginBlacklist(this);
6971
this.getProxy().getPluginManager().registerCommand(this,
7072
new OriginBlacklistCommandBungee(this, this.blacklist, "originblacklist"));
@@ -147,18 +149,8 @@ public final IEaglerXServerAPI getEaglerAPI() {
147149
}
148150

149151
@Override
150-
public final void log(final EnumLogLevel level, final String txt) {
151-
if (level == EnumLogLevel.WARN) {
152-
this.getLogger().warning(txt);
153-
} else if (level == EnumLogLevel.ERROR) {
154-
this.getLogger().severe(txt);
155-
} else if (level == EnumLogLevel.DEBUG) {
156-
if (this.blacklist != null && this.blacklist.isDebugEnabled()) {
157-
this.getLogger().info(txt);
158-
}
159-
} else {
160-
this.getLogger().info(txt);
161-
}
152+
public final JavaLogger getTheLogger() {
153+
return this.logger;
162154
}
163155

164156
@Override

‎src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package xyz.webmc.originblacklist.bungee.command;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.command.CommandContext;
3+
import xyz.webmc.originblacklist.core.OriginBlacklist;
4+
import xyz.webmc.originblacklist.core.command.CommandContext;
55

66
import net.md_5.bungee.api.CommandSender;
77
import net.md_5.bungee.api.chat.TextComponent;

‎src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package xyz.webmc.originblacklist.bungee.command;
22

3-
import xyz.webmc.originblacklist.base.OriginBlacklist;
4-
import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand;
5-
import xyz.webmc.originblacklist.bungee.OriginBlacklistBungee;
3+
import xyz.webmc.originblacklist.bungee.OriginBlacklistBungeePlugin;
4+
import xyz.webmc.originblacklist.core.OriginBlacklist;
5+
import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand;
66

77
import java.util.List;
88

@@ -14,7 +14,7 @@ public final class OriginBlacklistCommandBungee extends Command implements TabEx
1414
private final OriginBlacklistCommand cmd;
1515
private final OriginBlacklist blacklist;
1616

17-
public OriginBlacklistCommandBungee(final OriginBlacklistBungee plugin, final OriginBlacklist blacklist,
17+
public OriginBlacklistCommandBungee(final OriginBlacklistBungeePlugin plugin, final OriginBlacklist blacklist,
1818
final String command) {
1919
super(command);
2020
this.cmd = new OriginBlacklistCommand(blacklist);

0 commit comments

Comments
 (0)