Skip to content

Commit

Permalink
remove a ton of pointless multinewlines
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmonkey4eva committed Jan 9, 2020
1 parent 9566488 commit 4c52a6d
Show file tree
Hide file tree
Showing 149 changed files with 0 additions and 359 deletions.
4 changes: 0 additions & 4 deletions plugin/src/javadoc/stylesheet.css
Expand Up @@ -29,7 +29,6 @@ a:link { color:#0066cc; }
a:visited { color:#8b5caf; }
a:hover { color:#6699cc; }


/* Headings */
h1 {
font-size: 145%;
Expand All @@ -44,12 +43,10 @@ h1 {
text-align:left;
}


/* Default Table elements and colors */

th, table { border-collapse:collapse;border-color: #E6E7E8; }


.TableHeadingColor {
background:#000000 url(resources/bkg_blkheader.png) repeat-x scroll left top;
color:#FFFFFF;
Expand All @@ -64,7 +61,6 @@ th, table { border-collapse:collapse;border-color: #E6E7E8; }
padding-left: 10px;
}


.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
.TableRowColor { background: #FFFFFF; border-color: #E6E7E8;}
.TableRowColor td { line-height: 175%; padding-left: 10px;}
Expand Down
2 changes: 0 additions & 2 deletions plugin/src/main/java/com/denizenscript/denizen/Denizen.java
Expand Up @@ -91,7 +91,6 @@ public CommandManager getCommandManager() {
private TriggerRegistry triggerRegistry = new TriggerRegistry();
private DenizenNPCHelper npcHelper;


public BukkitCommandRegistry getCommandRegistry() {
return commandRegistry;
}
Expand Down Expand Up @@ -572,7 +571,6 @@ public void reloadConfig() {
SlowWarning.WARNING_RATE = Settings.warningRate();
}


/*
* Reloads, retrieves and saves progress information in
* Denizen/saves.yml and Denizen/scoreboards.yml
Expand Down
Expand Up @@ -26,12 +26,10 @@

public class CuboidEnterExitSmartEvent implements OldSmartEvent, Listener {


///////////////////
// SMARTEVENT METHODS
///////////////


ArrayList<String> cuboids_to_watch = new ArrayList<>();

@Override
Expand Down Expand Up @@ -72,15 +70,13 @@ public boolean shouldInitialize(Set<String> events) {

}


@Override
public void _initialize() {
DenizenAPI.getCurrentInstance().getServer().getPluginManager()
.registerEvents(this, DenizenAPI.getCurrentInstance());
Debug.log("Loaded Cuboid Enter & Exit SmartEvent.");
}


@Override
public void breakDown() {
PlayerMoveEvent.getHandlerList().unregister(this);
Expand Down
Expand Up @@ -13,12 +13,10 @@
*/
public class FlagSmartEvent implements OldSmartEvent, Listener {


///////////////////
// SMARTEVENT METHODS
///////////////


@Override
public boolean shouldInitialize(Set<String> events) {

Expand All @@ -37,14 +35,12 @@ public boolean shouldInitialize(Set<String> events) {
return false;
}


@Override
public void _initialize() {
active = true;
Debug.log("Loaded Flag SmartEvent.");
}


@Override
public void breakDown() {
active = false;
Expand Down
Expand Up @@ -13,12 +13,10 @@
*/
public class NPCNavigationSmartEvent implements OldSmartEvent, Listener {


///////////////////
// SMARTEVENT METHODS
///////////////


@Override
public boolean shouldInitialize(Set<String> events) {

Expand All @@ -36,14 +34,12 @@ public boolean shouldInitialize(Set<String> events) {
return false;
}


@Override
public void _initialize() {
active = true;
Debug.log("Loaded NPC Navigation SmartEvent.");
}


@Override
public void breakDown() {
active = false;
Expand Down
Expand Up @@ -33,7 +33,6 @@ public class EntityDespawnScriptEvent extends BukkitScriptEvent {
//
// -->


public EntityDespawnScriptEvent() {
instance = this;
}
Expand Down
Expand Up @@ -46,7 +46,6 @@ public EntityTamesScriptEvent() {
public EntityTag owner;
public EntityTameEvent event;


@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
String lower = CoreUtilities.toLowerCase(s);
Expand Down
Expand Up @@ -43,7 +43,6 @@ public EntityUnleashedScriptEvent() {
public ElementTag reason;
public EntityUnleashEvent event;


@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
String lower = CoreUtilities.toLowerCase(s);
Expand Down
Expand Up @@ -46,7 +46,6 @@ public HorseJumpsScriptEvent() {
public Float power;
public HorseJumpEvent event;


@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
String lower = CoreUtilities.toLowerCase(s);
Expand Down
Expand Up @@ -104,7 +104,6 @@ else if (cmd.equals("shoots")) {

}


@Override
public String getName() {
return "ProjectileHits";
Expand Down
Expand Up @@ -42,7 +42,6 @@ public SlimeSplitsScriptEvent() {
public int count;
public SlimeSplitEvent event;


@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
String lower = CoreUtilities.toLowerCase(s);
Expand Down
Expand Up @@ -80,7 +80,6 @@ public boolean matches(ScriptPath path) {

public static String oldWarningMessage = Deprecations.oldStylePlayerBreaksItemEvent.message;


@Override
public String getName() {
return "PlayerItemBreak";
Expand Down
Expand Up @@ -36,7 +36,6 @@ public class PlayerEmptiesBucketScriptEvent extends BukkitScriptEvent implements
//
// -->


public PlayerEmptiesBucketScriptEvent() {
instance = this;
}
Expand All @@ -48,7 +47,6 @@ public PlayerEmptiesBucketScriptEvent() {
public LocationTag location;
public PlayerBucketEmptyEvent event;


@Override
public boolean couldMatch(ScriptPath path) {
return path.eventLower.startsWith("player empties");
Expand Down
Expand Up @@ -36,7 +36,6 @@ public class PlayerFillsBucketScriptEvent extends BukkitScriptEvent implements L
//
// -->


public PlayerFillsBucketScriptEvent() {
instance = this;
}
Expand All @@ -49,7 +48,6 @@ public PlayerFillsBucketScriptEvent() {
public LocationTag location;
public PlayerBucketFillEvent event;


@Override
public boolean couldMatch(ScriptPath path) {
return path.eventLower.startsWith("player fills");
Expand Down
Expand Up @@ -48,7 +48,6 @@ public class PlayerItemTakesDamageScriptEvent extends BukkitScriptEvent implemen
ItemTag item;
LocationTag location;


public PlayerItemTakesDamageScriptEvent() {
instance = this;
}
Expand Down
Expand Up @@ -12,7 +12,6 @@
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.inventory.EquipmentSlot;


public class PlayerRightClicksEntityScriptEvent extends BukkitScriptEvent implements Listener {

// <--[event]
Expand Down Expand Up @@ -72,7 +71,6 @@ public String getName() {
return "PlayerRightClicksEntity";
}


@Override
public ScriptEntryData getScriptEntryData() {
return new BukkitScriptEntryData(PlayerTag.mirrorBukkitPlayer(event.getPlayer()), entity.isNPC() ? entity.getDenizenNPC() : null);
Expand Down
Expand Up @@ -76,7 +76,6 @@ public String getName() {
return "LingeringPotionSplash";
}


@Override
public ObjectTag getContext(String name) {
if (name.equals("location")) {
Expand Down
@@ -1,6 +1,5 @@
package com.denizenscript.denizen.events.world;


import com.denizenscript.denizen.objects.LocationTag;
import com.denizenscript.denizen.objects.MaterialTag;
import com.denizenscript.denizen.objects.WorldTag;
Expand Down
Expand Up @@ -27,7 +27,6 @@ public enum Action {
DIVIDE, INSERT, REMOVE, SPLIT, SPLIT_NEW, DELETE
}


// Constructor
private Denizen denizen;

Expand Down Expand Up @@ -754,7 +753,6 @@ private double math(double currentValue, double value, Action flagAction) {

}


/**
* Value object that is in charge of holding values that belong to a flag.
* Also contains some methods for retrieving stored values as specific
Expand Down
Expand Up @@ -196,7 +196,6 @@ public static Vector fixOffset(Vector offset, double yaw, double pitch) {
return offsetPatched;
}


public HashMap<UUID, UUID> attachmentsA = new HashMap<>(); // Key follows value
public HashMap<UUID, UUID> attachments2 = new HashMap<>(); // Value follows key
public HashMap<UUID, Vector> attachmentOffsets = new HashMap<>();
Expand Down
Expand Up @@ -54,7 +54,6 @@ public ActionHandler getActionHandler() {
return actionHandler;
}


/**
* Returns a NPCTag object when given a valid NPC. DenizenNPCs have some methods
* specific to Denizen functionality as well as easy access to the attached NPC and LivingEntity.
Expand Down Expand Up @@ -134,7 +133,6 @@ public void onSpawn(NPCSpawnEvent event) {
new NPCTag(event.getNPC()).action("spawn", null);
}


// <--[action]
// @Actions
// despawn
Expand Down Expand Up @@ -164,7 +162,6 @@ public void despawn(NPCDespawnEvent event) {
}
}


// <--[action]
// @Actions
// remove
Expand Down
Expand Up @@ -299,7 +299,6 @@ else if (event instanceof EntityDamageByBlockEvent) {

private UUID entityId;


// <--[action]
// @Actions
// hit
Expand Down
Expand Up @@ -35,7 +35,6 @@ public ConstantsTrait() {
super("constants");
}


/**
* Returns the value of the specified Constant, unique to this NPC. Note:
* Returns tags filled with the currently assigned NPC. See: Denizen TagManager
Expand All @@ -59,7 +58,6 @@ else if (getAssignmentConstants().containsKey(CoreUtilities.toLowerCase(name)))
return null;
}


/**
* Gets a map of the NPCs constants. Note: Does not include any constants
* inherited by the NPCs Assignment. To grab a comprehensive map of both,
Expand All @@ -71,7 +69,6 @@ public Map<String, String> getNPCConstants() {
return constants;
}


/**
* Gets a map of the NPCs constants, including those inherited by the Assignment.
* Any constants that are overridden by this NPC are taken into account, so this
Expand All @@ -87,7 +84,6 @@ public Map<String, String> getAllConstants() {
return allConstants;
}


/**
* Sets the value of a constant, as identified by the name. This will
* override any constants inherited from the NPCs Assignment.
Expand All @@ -99,7 +95,6 @@ public void setConstant(String name, String value) {
constants.put(CoreUtilities.toLowerCase(name), value);
}


/**
* Removes an NPC-specific constant, as identified by the name. This will
* not remove any values inherited from an NPCs Assignment, only constants
Expand All @@ -111,7 +106,6 @@ public void removeConstant(String name) {
constants.remove(CoreUtilities.toLowerCase(name));
}


/**
* Checks if this NPC has any unique constants, beyond what is inherited from
* the NPCs Assignment.
Expand All @@ -122,7 +116,6 @@ public boolean hasNPCConstants() {
return !constants.isEmpty();
}


public Map<String, String> getAssignmentConstants() {
// Check to make sure NPC has an assignment
if (npc.hasTrait(AssignmentTrait.class) && npc.getTrait(AssignmentTrait.class).hasAssignment()) {
Expand All @@ -137,7 +130,6 @@ public Map<String, String> getAssignmentConstants() {
return assignmentConstants;
}


public Map<String, String> rebuildAssignmentConstants() {
// Builds a map of constants inherited from the NPCs current Assignment
if (!npc.hasTrait(AssignmentTrait.class) || !npc.getTrait(AssignmentTrait.class).hasAssignment()) {
Expand Down Expand Up @@ -171,7 +163,6 @@ public Map<String, String> rebuildAssignmentConstants() {
return assignmentConstants;
}


/**
* Rebuilds assignment constants on a script reload
*/
Expand All @@ -180,7 +171,6 @@ public void onScriptsReload(ScriptReloadEvent event) {
rebuildAssignmentConstants();
}


public void describe(CommandSender sender, int page) throws CommandException {
Paginator paginator = new Paginator().header("Constants for " + npc.getName());
paginator.addLine("<e>NPC-specific constants: " + (hasNPCConstants() ? "" : "None.") + "");
Expand Down

0 comments on commit 4c52a6d

Please sign in to comment.