Skip to content

Commit

Permalink
Clean up Switch command code that used to make grown men blush.
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidcernat
davidcernat committed Jun 10, 2013
1 parent b093df3 commit 0e3374e
Showing 1 changed file with 24 additions and 129 deletions.
153 changes: 24 additions & 129 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/core/SwitchCommand.java
View file
Expand Up @@ -79,7 +79,7 @@ public void parseArgs(ScriptEntry theEntry) throws InvalidArgumentsException {

} else if (aH.matchesLocation(arg)) {
interactLocation = aH.getLocationFrom(arg);
if (interactLocation != null) dB.echoError("...switch LOCATION now: '%s'", arg);
if (interactLocation != null) dB.echoDebug("...switch LOCATION now: '%s'", arg);

} else throw new InvalidArgumentsException(Messages.ERROR_UNKNOWN_ARGUMENT, arg);
}
Expand All @@ -103,7 +103,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
// Store new delayed task ID, for checking against, then schedule new delayed task.
taskMap.put(interactLocation, denizen.getServer().getScheduler().scheduleSyncDelayedTask(denizen,
new Runnable() {
@Override public void run() {
public void run() {
// Check to see if the state of the block is what is expected. If switched during
// the duration, the switchback is cancelled.
if (switchState == SwitchState.OFF && !((interactLocation.getBlock().getData() & 0x8) > 0))
Expand All @@ -121,133 +121,28 @@ else if (switchState == SwitchState.ON && ((interactLocation.getBlock().getData(
public void switchBlock(Location interactLocation, SwitchState switchState) {
World world = interactLocation.getWorld();
boolean currentState = (interactLocation.getBlock().getData() & 0x8) > 0;

// Might be a way to generalize this portion and negate the need for a switch all-together.
switch (interactLocation.getBlock().getType()) {

case LEVER:
switch (switchState) {
case TOGGLE:
Block.LEVER.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.LEVER.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.LEVER.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case STONE_BUTTON:
switch (switchState) {
case TOGGLE:
Block.STONE_BUTTON.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.STONE_BUTTON.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.STONE_BUTTON.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case STONE_PLATE:
switch (switchState) {
case TOGGLE:
Block.STONE_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.STONE_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.STONE_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case WOOD_PLATE:
switch (switchState) {
case TOGGLE:
Block.WOOD_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.WOOD_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.WOOD_PLATE.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case WOODEN_DOOR:
switch (switchState) {
case TOGGLE:
Block.WOODEN_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.WOODEN_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.WOODEN_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case IRON_DOOR_BLOCK:
switch (switchState) {
case TOGGLE:
Block.IRON_DOOR_BLOCK.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.WOODEN_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.WOODEN_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

case TRAP_DOOR:
switch (switchState) {
case TOGGLE:
Block.TRAP_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case ON:
if (currentState != true)
Block.TRAP_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
case OFF:
if (currentState != false)
Block.TRAP_DOOR.interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), null, 0, 0f, 0f, 0f);
break;
}
dB.echoDebug("SWITCHED! Current state now: " + ((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));
break;

// If block isn't any of the above...
default:
dB.echoError("UNSWITCHABLE! Not a valid type of block!");
break;
String state = switchState.toString();

if ((state == "ON" && currentState == false) ||
(state == "OFF" && currentState == true) ||
state == "TOGGLE") {

try {

Block.byId[interactLocation.getBlock().getType().getId()]
.interact(((CraftWorld)world).getHandle(),
interactLocation.getBlockX(),
interactLocation.getBlockY(),
interactLocation.getBlockZ(),
null, 0, 0f, 0f, 0f);

dB.echoDebug("Switched " + interactLocation.getBlock().getType().toString() + "! Current state now: " +
((interactLocation.getBlock().getData() & 0x8) > 0 ? "ON" : "OFF"));

} catch (NullPointerException e) {

dB.echoDebug("Cannot switch " + interactLocation.getBlock().getType().toString() + "!");
}
}
}
}

0 comments on commit 0e3374e

Please sign in to comment.