Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup minecraft logger usage. fixes Issue #748

This commit is contained in:
Nick Minkler 2019-04-28 12:52:14 -07:00
parent 7fc36288bf
commit 1be47ae55b
30 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/milkbowl/vault/chat/plugins/Chat_DroxPerms.java
View File

@ -16,8 +16,8 @@ import de.hydrox.bukkit.DroxPerms.DroxPerms;
import de.hydrox.bukkit.DroxPerms.DroxPermsAPI;
public class Chat_DroxPerms extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "DroxPerms";
private Plugin plugin;
private DroxPermsAPI API;
@ -25,6 +25,7 @@ public class Chat_DroxPerms extends Chat {
public Chat_DroxPerms(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
// Load Plugin in case it was loaded before
if (API == null) {

3
src/net/milkbowl/vault/chat/plugins/Chat_GroupManager.java
View File

@ -35,7 +35,7 @@ import org.bukkit.plugin.Plugin;
public class Chat_GroupManager extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "GroupManager - Chat";
private Plugin plugin = null;
private GroupManager groupManager;
@ -43,6 +43,7 @@ public class Chat_GroupManager extends Chat {
public Chat_GroupManager(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/chat/plugins/Chat_Permissions3.java
View File

@ -32,8 +32,8 @@ import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;
public class Chat_Permissions3 extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private String name = "Permissions 3 (Yeti) - Chat";
private PermissionHandler perms;
private Plugin plugin = null;
@ -42,6 +42,7 @@ public class Chat_Permissions3 extends Chat {
public Chat_Permissions3(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java
View File

@ -34,7 +34,7 @@ import ru.tehkode.permissions.PermissionUser;
import ru.tehkode.permissions.bukkit.PermissionsEx;
public class Chat_PermissionsEx extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "PermissionsEx_Chat";
private Plugin plugin = null;
@ -43,6 +43,7 @@ public class Chat_PermissionsEx extends Chat {
public Chat_PermissionsEx(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_bPermissions.java
View File

@ -32,14 +32,15 @@ import de.bananaco.permissions.Permissions;
import de.bananaco.permissions.info.InfoReader;
public class Chat_bPermissions extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final String name = "bInfo";
private final Logger log;
private Plugin plugin = null;
InfoReader chat;
public Chat_bPermissions(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_bPermissions2.java
View File

@ -32,7 +32,7 @@ import de.bananaco.bpermissions.api.ApiLayer;
import de.bananaco.bpermissions.api.CalculableType;
public class Chat_bPermissions2 extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "bInfo";
private Plugin plugin = null;
private boolean hooked = false;
@ -40,6 +40,7 @@ public class Chat_bPermissions2 extends Chat {
public Chat_bPermissions2(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_iChat.java
View File

@ -33,7 +33,7 @@ import org.bukkit.plugin.Plugin;
public class Chat_iChat extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "iChat";
private Plugin plugin = null;
private iChatAPI iChat = null;
@ -41,6 +41,7 @@ public class Chat_iChat extends Chat {
public Chat_iChat(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_mChat.java
View File

@ -31,7 +31,7 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Chat_mChat extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "mChat";
private Plugin plugin = null;
private mChatAPI mChat = null;
@ -39,6 +39,7 @@ public class Chat_mChat extends Chat {
public Chat_mChat(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java
View File

@ -34,7 +34,7 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Chat_mChatSuite extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "mChatSuite";
private Plugin plugin = null;
private mChatSuite mChat = null;
@ -42,6 +42,7 @@ public class Chat_mChatSuite extends Chat {
public Chat_mChatSuite(Plugin plugin, Permission perms) {
super(perms);
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(), plugin);

3
src/net/milkbowl/vault/chat/plugins/Chat_rscPermissions.java
View File

@ -32,7 +32,7 @@ import ru.simsonic.rscPermissions.MainPluginClass;
public class Chat_rscPermissions extends Chat {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final Plugin vault;
private ru.simsonic.rscPermissions.MainPluginClass rscp;
private ru.simsonic.rscPermissions.rscpAPI rscpAPI;
@ -40,6 +40,7 @@ public class Chat_rscPermissions extends Chat {
public Chat_rscPermissions(Plugin plugin, Permission perm) {
super(perm);
this.vault = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new ChatServerListener(this), vault);
if (rscp == null) {
Plugin perms = plugin.getServer().getPluginManager().getPlugin("rscPermissions");

4
src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
View File

@ -33,14 +33,14 @@ import org.bukkit.plugin.Plugin;
import cosine.boseconomy.BOSEconomy;
public class Economy_BOSE7 extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "BOSEconomy";
private Plugin plugin = null;
private BOSEconomy economy = null;
public Economy_BOSE7(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

4
src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java
View File

@ -20,14 +20,14 @@ import net.milkbowl.vault.economy.EconomyResponse;
import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
public class Economy_CommandsEX extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "CommandsEX Economy";
private Plugin plugin = null;
private CommandsEX economy = null;
public Economy_CommandsEX(Plugin plugin){
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
if (economy == null) {

3
src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java
View File

@ -37,13 +37,14 @@ import com.greatmancode.craftconomy3.groups.WorldGroupsManager;
import com.greatmancode.craftconomy3.tools.interfaces.BukkitLoader;
public class Economy_Craftconomy3 extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "Craftconomy3";
private Plugin plugin = null;
protected BukkitLoader economy = null;
public Economy_Craftconomy3(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/economy/plugins/Economy_CurrencyCore.java
View File

@ -36,12 +36,13 @@ import org.bukkit.plugin.Plugin;
public class Economy_CurrencyCore extends AbstractEconomy {
private Currency currency;
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final Plugin plugin;
private final String name = "CurrencyCore";
public Economy_CurrencyCore(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

4
src/net/milkbowl/vault/economy/plugins/Economy_DigiCoin.java
View File

@ -33,14 +33,14 @@ import net.milkbowl.vault.economy.EconomyResponse;
import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
public class Economy_DigiCoin extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "DigiCoin";
private Plugin plugin = null;
private DigiCoin economy = null;
public Economy_DigiCoin(Plugin plugin){
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
if (economy == null) {

3
src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java
View File

@ -36,7 +36,7 @@ import org.bukkit.plugin.Plugin;
import ca.agnate.EconXP.EconXP;
public class Economy_EconXP extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "EconXP";
private Plugin plugin = null;
@ -44,6 +44,7 @@ public class Economy_EconXP extends AbstractEconomy {
public Economy_EconXP(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
log.log(Level.WARNING, "EconXP is an integer only economy, you may notice inconsistencies with accounts if you do not setup your other econ using plugins accordingly!");
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java
View File

@ -36,14 +36,15 @@ import com.earth2me.essentials.api.NoLoanPermittedException;
import com.earth2me.essentials.api.UserDoesNotExistException;
public class Economy_Essentials extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final String name = "Essentials Economy";
private final Logger log;
private Plugin plugin = null;
private Essentials ess = null;
public Economy_Essentials(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

6
src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java
View File

@ -33,14 +33,14 @@ import org.bukkit.plugin.Plugin;
import com.flobi.GoldIsMoney2.GoldIsMoney;
public class Economy_GoldIsMoney2 extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "GoldIsMoney";
private Plugin plugin = null;
protected GoldIsMoney economy = null;
public Economy_GoldIsMoney2(Plugin plugin) {
this.plugin = plugin;
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before
if (economy == null) {

3
src/net/milkbowl/vault/economy/plugins/Economy_GoldenChestEconomy.java
View File

@ -32,7 +32,7 @@ import net.milkbowl.vault.economy.EconomyResponse;
import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
public class Economy_GoldenChestEconomy extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "GoldenChestEconomy";
private Plugin plugin = null;
@ -41,6 +41,7 @@ public class Economy_GoldenChestEconomy extends AbstractEconomy {
public Economy_GoldenChestEconomy (Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before
if (economy == null) {

3
src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
View File

@ -36,7 +36,7 @@ import org.gestern.gringotts.Gringotts;
public class Economy_Gringotts extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "Gringotts";
private Plugin plugin = null;
@ -44,6 +44,7 @@ public class Economy_Gringotts extends AbstractEconomy {
public Economy_Gringotts(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before
if (gringotts == null) {

3
src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java
View File

@ -34,7 +34,7 @@ import org.bukkit.plugin.Plugin;
import boardinggamer.mcmoney.McMoneyAPI;
public class Economy_McMoney extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "McMoney";
private Plugin plugin = null;
@ -42,6 +42,7 @@ public class Economy_McMoney extends AbstractEconomy {
public Economy_McMoney(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/economy/plugins/Economy_MiConomy.java
View File

@ -36,7 +36,7 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Economy_MiConomy extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "MiConomy";
@ -46,6 +46,7 @@ public class Economy_MiConomy extends AbstractEconomy {
public Economy_MiConomy(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

6
src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java
View File

@ -37,14 +37,14 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Economy_MineConomy extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "MineConomy";
private Plugin plugin = null;
private MineConomy econ = null;
public Economy_MineConomy(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before
@ -269,4 +269,4 @@ public class Economy_MineConomy extends AbstractEconomy {
public boolean createPlayerAccount(String playerName, String worldName) {
return createPlayerAccount(playerName);
}
}
}

4
src/net/milkbowl/vault/economy/plugins/Economy_Minefaconomy.java
View File

@ -16,8 +16,7 @@ import net.milkbowl.vault.economy.AbstractEconomy;
import net.milkbowl.vault.economy.EconomyResponse;
public class Economy_Minefaconomy extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "Minefaconomy";
private Plugin plugin = null;
@ -25,6 +24,7 @@ public class Economy_Minefaconomy extends AbstractEconomy {
public Economy_Minefaconomy(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
Plugin econ = null;
// Load Plugin in case it was loaded before

4
src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java
View File

@ -34,14 +34,14 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Economy_MultiCurrency extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "MultiCurrency";
private Plugin plugin = null;
private Currency economy = null;
public Economy_MultiCurrency(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

11
src/net/milkbowl/vault/economy/plugins/Economy_SDFEconomy.java
View File

@ -32,15 +32,14 @@ import net.milkbowl.vault.economy.AbstractEconomy;
import net.milkbowl.vault.economy.EconomyResponse;
public class Economy_SDFEconomy extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private Plugin plugin = null;
private final Logger log;
private final String name = "SDFEconomy";
private Plugin plugin = null;
private SDFEconomyAPI api = null;
public Economy_SDFEconomy(Plugin _plugin) {
plugin = _plugin;
public Economy_SDFEconomy(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
// Register a listener to wait for plugin being loaded
plugin.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);

4
src/net/milkbowl/vault/economy/plugins/Economy_TAEcon.java
View File

@ -33,14 +33,14 @@ import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
import net.teamalpha.taecon.TAEcon;
public class Economy_TAEcon extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "TAEcon";
private Plugin plugin = null;
private TAEcon economy = null;
public Economy_TAEcon(Plugin plugin){
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
if (economy == null) {

5
src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java
View File

@ -37,10 +37,8 @@ import com.gmail.mirelatrue.xpbank.GroupBank;
import com.gmail.mirelatrue.xpbank.XPBank;
public class Economy_XPBank extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "XPBank";
private Plugin plugin = null;
private XPBank XPB = null;
@ -48,6 +46,7 @@ public class Economy_XPBank extends AbstractEconomy {
public Economy_XPBank (Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java
View File

@ -33,7 +33,7 @@ import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
public class Economy_eWallet extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private final String name = "eWallet";
private Plugin plugin = null;
@ -41,6 +41,7 @@ public class Economy_eWallet extends AbstractEconomy {
public Economy_eWallet(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
// Load Plugin in case it was loaded before

3
src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java
View File

@ -36,7 +36,7 @@ import com.iCo6.system.Accounts;
import com.iCo6.system.Holdings;
public class Economy_iConomy6 extends AbstractEconomy {
private static final Logger log = Logger.getLogger("Minecraft");
private final Logger log;
private String name = "iConomy ";
private Plugin plugin = null;
@ -45,6 +45,7 @@ public class Economy_iConomy6 extends AbstractEconomy {
public Economy_iConomy6(Plugin plugin) {
this.plugin = plugin;
this.log = plugin.getLogger();
Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin);
log.warning("iConomy - If you are using Flatfile storage be aware that versions 6, 7 and 8 have a CRITICAL bug which can wipe ALL iconomy data.");
log.warning("if you're using Votifier, or any other plugin which handles economy data in a threaded manner your server is at risk!");