Skip to content

fixed some minor things #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fixed some minor things #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34815b7
Updated all classes
Nov 17, 2015
6eb52d6
Updated packagenames
Nov 30, 2015
ecf109b
Merge branch 'master' of https://github.com/VinciDev/BungeeBan
Nov 30, 2015
4fdd53a
Updated plugin.yml
Nov 30, 2015
0d8e9d2
Bug fixes
Nubebuster Jan 18, 2016
ad0081a
Missing updates from the last commit
Nubebuster Jan 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed BungeeBan-latest.jar
View file
Open in desktop
Binary file not shown.
28 changes: 15 additions & 13 deletions src/de/VinciDev/BungeeBan/Main.java → src/de/VinciDev/BungeeBan/BungeeBan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
package de.VinciDev.BungeeBan;
package de.vincidev.bungeeban;

import java.io.IOException;

import com.google.gson.Gson;

import de.VinciDev.BungeeBan.Handlers.PlayerConnect;
import de.VinciDev.BungeeBan.Metrics.Metrics;
import de.VinciDev.BungeeBan.Util.BungeeBan;
import de.VinciDev.BungeeBan.Util.FileManager;
import de.VinciDev.BungeeBan.Util.MySQL;
import de.VinciDev.BungeeBan.Util.UpdateChecker;
import de.vincidev.bungeeban.handlers.BroadcastHandlers;
import de.vincidev.bungeeban.handlers.PlayerConnect;
import de.vincidev.bungeeban.metrics.Metrics;
import de.vincidev.bungeeban.utils.BungeeBanUtils;
import de.vincidev.bungeeban.utils.FileManager;
import de.vincidev.bungeeban.utils.MySQL;
import de.vincidev.bungeeban.utils.UpdateChecker;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.plugin.PluginManager;

public class Main extends Plugin {
public class BungeeBan extends Plugin {

static String prefix = "";
static MySQL mysql;
static Main main;
static BungeeBan main;
static Gson gson;
public static final String rsId = "5924";

Expand Down Expand Up @@ -49,7 +50,7 @@ public void onEnable() {
mysql.openConnection();
if (mysql.isConnected()) {
log("�9Connection successful. Tables will be created if they do not already exist.");
BungeeBan.createTables();
BungeeBanUtils.createTables();
} else {
log("�cThe mysql connection was not successful. Please recheck your config.yml");
}
Expand Down Expand Up @@ -77,14 +78,15 @@ public void onDisable() {
public void register() {
PluginManager pm = BungeeCord.getInstance().getPluginManager();
pm.registerListener(this, new PlayerConnect());
pm.registerListener(this, new BroadcastHandlers());
}

@SuppressWarnings("deprecation")
public static void log(String msg) {
BungeeCord.getInstance().getConsole().sendMessage(msg);
}

public static Main getInstance() {
public static BungeeBan getInstance() {
return main;
}

Expand All @@ -97,11 +99,11 @@ public static String getPrefix() {
}

public static void setMysql(MySQL mysql) {
Main.mysql = mysql;
BungeeBan.mysql = mysql;
}

public static void setPrefix(String prefix) {
Main.prefix = prefix;
BungeeBan.prefix = prefix;
}

public static Gson getGson() {
Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Commands/CustomCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Commands;
package de.vincidev.bungeeban.commands;

import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeBanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeBanIpEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import net.md_5.bungee.api.plugin.Event;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeKickEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeMuteEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeMuteIpEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import net.md_5.bungee.api.plugin.Event;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeReportEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeUnbanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeUnmuteEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeUnwarnEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Events/BungeeWarnEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.VinciDev.BungeeBan.Events;
package de.vincidev.bungeeban.events;

import java.util.UUID;

Expand Down
24 changes: 12 additions & 12 deletions src/de/VinciDev/BungeeBan/Handlers/BroadcastHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package de.VinciDev.BungeeBan.Handlers;

import de.VinciDev.BungeeBan.Events.BungeeBanEvent;
import de.VinciDev.BungeeBan.Events.BungeeBanIpEvent;
import de.VinciDev.BungeeBan.Events.BungeeKickEvent;
import de.VinciDev.BungeeBan.Events.BungeeMuteEvent;
import de.VinciDev.BungeeBan.Events.BungeeMuteIpEvent;
import de.VinciDev.BungeeBan.Events.BungeeReportEvent;
import de.VinciDev.BungeeBan.Events.BungeeUnbanEvent;
import de.VinciDev.BungeeBan.Events.BungeeUnmuteEvent;
import de.VinciDev.BungeeBan.Events.BungeeUnwarnEvent;
import de.VinciDev.BungeeBan.Events.BungeeWarnEvent;
package de.vincidev.bungeeban.handlers;

import de.vincidev.bungeeban.events.BungeeBanEvent;
import de.vincidev.bungeeban.events.BungeeBanIpEvent;
import de.vincidev.bungeeban.events.BungeeKickEvent;
import de.vincidev.bungeeban.events.BungeeMuteEvent;
import de.vincidev.bungeeban.events.BungeeMuteIpEvent;
import de.vincidev.bungeeban.events.BungeeReportEvent;
import de.vincidev.bungeeban.events.BungeeUnbanEvent;
import de.vincidev.bungeeban.events.BungeeUnmuteEvent;
import de.vincidev.bungeeban.events.BungeeUnwarnEvent;
import de.vincidev.bungeeban.events.BungeeWarnEvent;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;

Expand Down
6 changes: 3 additions & 3 deletions src/de/VinciDev/BungeeBan/Handlers/PlayerConnect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.VinciDev.BungeeBan.Handlers;
package de.vincidev.bungeeban.handlers;

import de.VinciDev.BungeeBan.Util.BungeeBan;
import de.vincidev.bungeeban.utils.BungeeBanUtils;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.ServerConnectEvent;
import net.md_5.bungee.api.plugin.Listener;
Expand All @@ -10,6 +10,6 @@ public class PlayerConnect implements Listener {
@EventHandler
public void onConnected(ServerConnectEvent e) {
ProxiedPlayer p = e.getPlayer();
BungeeBan.pushPlayer(p);
BungeeBanUtils.pushPlayer(p);
}
}
2 changes: 1 addition & 1 deletion src/de/VinciDev/BungeeBan/Metrics/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* authors and contributors and should not be interpreted as representing official policies,
* either expressed or implied, of anybody else.
*/
package de.VinciDev.BungeeBan.Metrics;
package de.vincidev.bungeeban.metrics;

import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin;
Expand Down
Loading