Skip to content

Commit

Permalink
Automated code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jun 28, 2015
1 parent 12650ed commit e1110c3
Show file tree
Hide file tree
Showing 419 changed files with 5,245 additions and 4,790 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/BukkitScriptEntryData.java
View file
Expand Up @@ -44,8 +44,8 @@ public void transferDataFrom(ScriptEntryData scriptEntryData) {
if (scriptEntryData == null) {
return;
}
player = ((BukkitScriptEntryData)scriptEntryData).getPlayer();
npc = ((BukkitScriptEntryData)scriptEntryData).getNPC();
player = ((BukkitScriptEntryData) scriptEntryData).getPlayer();
npc = ((BukkitScriptEntryData) scriptEntryData).getNPC();

}

Expand Down
121 changes: 62 additions & 59 deletions src/main/java/net/aufdemrand/denizen/Denizen.java
View file
@@ -1,17 +1,19 @@
package net.aufdemrand.denizen;

import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;

import net.aufdemrand.denizen.events.block.*;
import net.aufdemrand.denizen.events.bukkit.SavesReloadEvent;
import net.aufdemrand.denizen.events.bukkit.ScriptReloadEvent;
import net.aufdemrand.denizen.events.core.*;
import net.aufdemrand.denizen.events.entity.*;
import net.aufdemrand.denizen.events.player.*;
import net.aufdemrand.denizen.events.world.*;
import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.listeners.ListenerRegistry;
import net.aufdemrand.denizen.npc.dNPCRegistry;
import net.aufdemrand.denizen.npc.speech.DenizenChat;
import net.aufdemrand.denizen.npc.traits.*;
import net.aufdemrand.denizen.objects.*;
import net.aufdemrand.denizen.objects.notable.NotableManager;
import net.aufdemrand.denizen.objects.properties.bukkit.BukkitElementProperties;
import net.aufdemrand.denizen.objects.properties.bukkit.BukkitListProperties;
import net.aufdemrand.denizen.objects.properties.bukkit.BukkitQueueProperties;
Expand All @@ -22,52 +24,42 @@
import net.aufdemrand.denizen.objects.properties.inventory.InventorySize;
import net.aufdemrand.denizen.objects.properties.inventory.InventoryTitle;
import net.aufdemrand.denizen.objects.properties.item.*;
import net.aufdemrand.denizen.scripts.commands.BukkitCommandRegistry;
import net.aufdemrand.denizen.scripts.containers.core.*;
import net.aufdemrand.denizen.scripts.requirements.RequirementChecker;
import net.aufdemrand.denizen.scripts.requirements.RequirementRegistry;
import net.aufdemrand.denizen.scripts.triggers.TriggerRegistry;
import net.aufdemrand.denizen.tags.BukkitTagContext;
import net.aufdemrand.denizen.tags.core.*;
import net.aufdemrand.denizen.utilities.*;
import net.aufdemrand.denizen.utilities.command.CommandManager;
import net.aufdemrand.denizen.utilities.command.Injector;
import net.aufdemrand.denizen.utilities.command.messaging.Messaging;
import net.aufdemrand.denizen.utilities.debugging.LogInterceptor;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.depends.Depends;
import net.aufdemrand.denizen.utilities.entity.CraftFakeArrow;
import net.aufdemrand.denizen.utilities.entity.CraftFakePlayer;
import net.aufdemrand.denizen.utilities.entity.CraftItemProjectile;
import net.aufdemrand.denizen.utilities.entity.DenizenEntityType;
import net.aufdemrand.denizen.utilities.maps.DenizenMapManager;
import net.aufdemrand.denizen.utilities.packets.intercept.DenizenPacketListener;
import net.aufdemrand.denizencore.DenizenCore;
import net.aufdemrand.denizencore.DenizenImplementation;
import net.aufdemrand.denizencore.events.OldEventManager;
import net.aufdemrand.denizen.events.bukkit.SavesReloadEvent;
import net.aufdemrand.denizen.events.bukkit.ScriptReloadEvent;
import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.scripts.commands.BukkitCommandRegistry;
import net.aufdemrand.denizencore.events.ScriptEvent;
import net.aufdemrand.denizencore.interfaces.dExternal;
import net.aufdemrand.denizencore.objects.*;
import net.aufdemrand.denizencore.objects.properties.PropertyParser;
import net.aufdemrand.denizencore.scripts.*;
import net.aufdemrand.denizencore.scripts.queues.ScriptQueue;
import net.aufdemrand.denizen.scripts.requirements.RequirementChecker;
import net.aufdemrand.denizen.utilities.*;
import net.aufdemrand.denizen.utilities.debugging.LogInterceptor;
import net.aufdemrand.denizen.utilities.maps.DenizenMapManager;
import net.aufdemrand.denizencore.interfaces.dExternal;
import net.aufdemrand.denizen.listeners.ListenerRegistry;
import net.aufdemrand.denizen.npc.dNPCRegistry;
import net.aufdemrand.denizen.npc.speech.DenizenChat;
import net.aufdemrand.denizen.npc.traits.*;
import net.aufdemrand.denizen.objects.*;
import net.aufdemrand.denizen.objects.notable.NotableManager;
import net.aufdemrand.denizencore.objects.properties.PropertyParser;
import net.aufdemrand.denizen.scripts.containers.core.*;
import net.aufdemrand.denizencore.scripts.queues.core.InstantQueue;
import net.aufdemrand.denizen.scripts.requirements.RequirementRegistry;
import net.aufdemrand.denizen.scripts.triggers.TriggerRegistry;
import net.aufdemrand.denizencore.tags.TagContext;
import net.aufdemrand.denizencore.tags.TagManager;
import net.aufdemrand.denizen.utilities.command.CommandManager;
import net.aufdemrand.denizen.utilities.command.Injector;
import net.aufdemrand.denizen.utilities.command.messaging.Messaging;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.depends.Depends;
import net.aufdemrand.denizencore.DenizenCore;
import net.aufdemrand.denizencore.DenizenImplementation;
import net.aufdemrand.denizencore.utilities.debugging.Debuggable;
import net.aufdemrand.denizencore.utilities.debugging.dB.DebugElement;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.trait.TraitInfo;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
Expand All @@ -81,6 +73,13 @@
import org.bukkit.event.HandlerList;
import org.bukkit.plugin.java.JavaPlugin;

import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;

// <--[language]
// @name dObjects
// @group Object System
Expand Down Expand Up @@ -258,7 +257,6 @@ public CommandManager getCommandManager() {
}



/*
* Denizen Registries
*/
Expand Down Expand Up @@ -336,8 +334,7 @@ public NotableManager notableManager() {
/**
* Gets the currently loaded instance of the RequirementChecker
*
* @return ScriptHelper
*
* @return ScriptHelper
*/
public RequirementChecker getRequirementChecker() {
return requirementChecker;
Expand Down Expand Up @@ -369,7 +366,7 @@ public void onEnable() {
// Activate dependencies
depends.initialize();

if(Depends.citizens == null || !Depends.citizens.isEnabled()) {
if (Depends.citizens == null || !Depends.citizens.isEnabled()) {
getLogger().warning("Citizens does not seem to be activated! Denizen will have greatly reduced functionality!");
//getServer().getPluginManager().disablePlugin(this);
//return;
Expand All @@ -384,7 +381,7 @@ public void onEnable() {
dB.log(ChatColor.YELLOW + "(/(-/ )/ /_(-/ ) " + ChatColor.GRAY + " scriptable minecraft");
dB.log("");
dB.log(ChatColor.GRAY + "by: " + ChatColor.WHITE + "aufdemrand");
dB.log(ChatColor.GRAY + "version: "+ ChatColor.WHITE + versionTag);
dB.log(ChatColor.GRAY + "version: " + ChatColor.WHITE + versionTag);
dB.log(ChatColor.LIGHT_PURPLE + "+-------------------------+");
}
catch (Exception e) {
Expand Down Expand Up @@ -419,7 +416,7 @@ public void onEnable() {
DenizenEntityType.registerEntityType("FAKE_PLAYER", CraftFakePlayer.class);

// Track all player names for quick dPlayer matching
for (OfflinePlayer player: Bukkit.getOfflinePlayers()) {
for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
dPlayer.notePlayer(player);
}
}
Expand Down Expand Up @@ -750,7 +747,7 @@ public void onEnable() {
}

try {
for (World world: getServer().getWorlds()) {
for (World world : getServer().getWorlds()) {
EntityScriptHelper.linkWorld(world);
}
}
Expand Down Expand Up @@ -799,7 +796,7 @@ public void run() {
*/
@Override
public void onDisable() {
if(!startedSuccessful) return;
if (!startedSuccessful) return;

// <--[event]
// @Events
Expand Down Expand Up @@ -837,8 +834,11 @@ public void onDisable() {

for (OfflinePlayer player : this.getServer().getOfflinePlayers()) {
try {
getListenerRegistry().deconstructPlayer(dPlayer.mirrorBukkitPlayer(player)); } catch (Exception e) {
if (player == null) dB.echoError("Tell the Denizen team ASAP about this error! ERR: OPN: " + e.toString());
getListenerRegistry().deconstructPlayer(dPlayer.mirrorBukkitPlayer(player));
}
catch (Exception e) {
if (player == null)
dB.echoError("Tell the Denizen team ASAP about this error! ERR: OPN: " + e.toString());
else dB.echoError("'" + player.getName() + "' is having trouble deconstructing! " +
"You might have a corrupt player file!");
}
Expand Down Expand Up @@ -958,7 +958,7 @@ public void updateSaves() {
}
section = savesConfig.getConfigurationSection("Listeners");
if (section != null) {
for (String key: section.getKeys(false)) {
for (String key : section.getKeys(false)) {
try {
dPlayer player = dPlayer.valueOf(key);
if (player == null)
Expand Down Expand Up @@ -1012,17 +1012,20 @@ public void saveSaves() {
DenizenMapManager.saveMaps();
try {
savesConfig.save(savesConfigFile);
} catch (IOException ex) {
}
catch (IOException ex) {
Logger.getLogger(JavaPlugin.class.getName()).log(Level.SEVERE, "Could not save to " + savesConfigFile, ex);
}
try {
scoreboardsConfig.save(scoreboardsConfigFile);
} catch (IOException ex) {
}
catch (IOException ex) {
Logger.getLogger(JavaPlugin.class.getName()).log(Level.SEVERE, "Could not save to " + scoreboardsConfigFile, ex);
}
try {
entityConfig.save(entityConfigFile);
} catch (IOException ex) {
}
catch (IOException ex) {
Logger.getLogger(JavaPlugin.class.getName()).log(Level.SEVERE, "Could not save to " + entityConfigFile, ex);
}
}
Expand Down Expand Up @@ -1076,7 +1079,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
if (Depends.citizens != null && Depends.citizens.getNPCSelector().getSelected(sender) != null)
npc = new dNPC(Depends.citizens.getNPCSelector().getSelected(sender));
List<ScriptEntry> scriptEntries = ScriptBuilder.buildScriptEntries(entries, null,
new BukkitScriptEntryData(sender instanceof Player ? new dPlayer((Player)sender): null, npc));
new BukkitScriptEntryData(sender instanceof Player ? new dPlayer((Player) sender) : null, npc));

queue.addEntries(scriptEntries);
queue.start();
Expand All @@ -1090,7 +1093,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdName, Stri
return suggestClosestModifier(sender, cmd.getName(), modifier);
}

Object[] methodArgs = { sender };
Object[] methodArgs = {sender};
return commandManager.executeSafe(cmd, args, sender, methodArgs);

}
Expand Down Expand Up @@ -1209,9 +1212,9 @@ public List<net.aufdemrand.denizencore.utilities.YamlConfiguration> getOutsideSc

@Override
public void handleCommandSpecialCases(ScriptEntry scriptEntry) {
if (((BukkitScriptEntryData)scriptEntry.entryData).hasNPC()
&& ((BukkitScriptEntryData)scriptEntry.entryData).getNPC().getCitizen() == null)
((BukkitScriptEntryData)scriptEntry.entryData).setNPC(null);
if (((BukkitScriptEntryData) scriptEntry.entryData).hasNPC()
&& ((BukkitScriptEntryData) scriptEntry.entryData).getNPC().getCitizen() == null)
((BukkitScriptEntryData) scriptEntry.entryData).setNPC(null);
}

@Override
Expand All @@ -1232,11 +1235,11 @@ public void debugCommandHeader(ScriptEntry scriptEntry) {

@Override
public TagContext getTagContextFor(ScriptEntry scriptEntry, boolean b) {
dPlayer player = scriptEntry != null ? ((BukkitScriptEntryData)scriptEntry.entryData).getPlayer(): null;
dNPC npc = scriptEntry != null ? ((BukkitScriptEntryData)scriptEntry.entryData).getNPC(): null;
dPlayer player = scriptEntry != null ? ((BukkitScriptEntryData) scriptEntry.entryData).getPlayer() : null;
dNPC npc = scriptEntry != null ? ((BukkitScriptEntryData) scriptEntry.entryData).getNPC() : null;
return new BukkitTagContext(player, npc, b, scriptEntry,
scriptEntry != null ? scriptEntry.shouldDebug(): true,
scriptEntry != null ? scriptEntry.getScript(): null);
scriptEntry != null ? scriptEntry.shouldDebug() : true,
scriptEntry != null ? scriptEntry.getScript() : null);
}

@Override
Expand All @@ -1249,7 +1252,7 @@ public boolean handleCustomArgs(ScriptEntry scriptEntry, aH.Argument arg, boolea
if (player == null || !player.isValid()) {
dB.echoError(scriptEntry.getResidingQueue(), value + " is an invalid player!");
}
((BukkitScriptEntryData)scriptEntry.entryData).setPlayer(player);
((BukkitScriptEntryData) scriptEntry.entryData).setPlayer(player);
return true;
}

Expand All @@ -1262,7 +1265,7 @@ else if (arg.matchesPrefix("npc, npcid") && !if_ignore) {
dB.echoError(scriptEntry.getResidingQueue(), value + " is an invalid NPC!");
return false;
}
((BukkitScriptEntryData)scriptEntry.entryData).setNPC(npc);
((BukkitScriptEntryData) scriptEntry.entryData).setNPC(npc);
return true;
}
return false;
Expand Down

0 comments on commit e1110c3

Please sign in to comment.