From 65122cc09883549ce9db7019656b6e10048cfd31 Mon Sep 17 00:00:00 2001 From: Charlie Wang Date: Sun, 30 Jun 2013 15:17:56 -0400 Subject: [PATCH] Converted spaces to tabs, except for plugin.yml --- .../bukkit/discosheep/DiscoSheep.java | 142 +++++++++--------- .../discosheep/DiscoSheepCommandExecutor.java | 26 ++-- .../bukkit/discosheep/DiscoUpdater.java | 54 +++---- 3 files changed, 110 insertions(+), 112 deletions(-) diff --git a/src/gibstick/bukkit/discosheep/DiscoSheep.java b/src/gibstick/bukkit/discosheep/DiscoSheep.java index d3d1605..4e54979 100644 --- a/src/gibstick/bukkit/discosheep/DiscoSheep.java +++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java @@ -1,97 +1,97 @@ package gibstick.bukkit.discosheep; import java.util.ArrayList; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.entity.Sheep; import org.bukkit.Location; -import org.bukkit.entity.EntityType; import org.bukkit.World; +import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; +import org.bukkit.entity.Sheep; import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; public final class DiscoSheep extends JavaPlugin { - private ArrayList sheepArray = new ArrayList(); - private DiscoUpdater updater = new DiscoUpdater(this); - // radius for random sheep spawns around player - private static int sheepSpawnRadius = 5; + private ArrayList sheepArray = new ArrayList(); + private DiscoUpdater updater = new DiscoUpdater(this); + // radius for random sheep spawns around player + private static int sheepSpawnRadius = 5; - @Override - public void onEnable() { - getCommand("ds").setExecutor(new DiscoSheepCommandExecutor(this)); - } + @Override + public void onEnable() { + getCommand("ds").setExecutor(new DiscoSheepCommandExecutor(this)); + } - @Override - public void onDisable() { - // Watashi Wa Kawaii, Ne? - } + @Override + public void onDisable() { + // Watashi Wa Kawaii, Ne? + } - void spawnSheep(World world, Location loc) { - Sheep newSheep = (Sheep) world.spawnEntity(loc, EntityType.SHEEP); - newSheep.setMaxHealth(10000); - newSheep.setHealth(10000); - sheepArray.add(newSheep); - } + void spawnSheep(World world, Location loc) { + Sheep newSheep = (Sheep) world.spawnEntity(loc, EntityType.SHEEP); + newSheep.setMaxHealth(10000); + newSheep.setHealth(10000); + sheepArray.add(newSheep); + } - // Spawn some number of sheep next to given player - void spawnSheep(Player player, int num) { - Location loc; - World world = player.getWorld(); + // Spawn some number of sheep next to given player + void spawnSheep(Player player, int num) { + Location loc; + World world = player.getWorld(); - for (int i = 0; i < num; i++) { - double x, y, z; + for (int i = 0; i < num; i++) { + double x, y, z; - // random x and z coordinates within a 5 block radius - // safe y-coordinate - x = -sheepSpawnRadius + (Math.random() * ((sheepSpawnRadius * 2) + 1)) + player.getLocation().getX(); - z = -sheepSpawnRadius + (Math.random() * ((sheepSpawnRadius * 2) + 1)) + player.getLocation().getZ(); - y = world.getHighestBlockYAt((int) x, (int) z); - loc = new Location(world, x, y, z); - spawnSheep(world, loc); - } - } + // random x and z coordinates within a 5 block radius + // safe y-coordinate + x = -sheepSpawnRadius + (Math.random() * ((sheepSpawnRadius * 2) + 1)) + player.getLocation().getX(); + z = -sheepSpawnRadius + (Math.random() * ((sheepSpawnRadius * 2) + 1)) + player.getLocation().getZ(); + y = world.getHighestBlockYAt((int) x, (int) z); + loc = new Location(world, x, y, z); + spawnSheep(world, loc); + } + } - // Mark all sheep in the sheep array for removal - void removeAllSheep() { - for (int i = 0; i < sheepArray.size(); i++) { - sheepArray.get(i).remove(); - } - sheepArray.clear(); - } + // Mark all sheep in the sheep array for removal, then clear the array + void removeAllSheep() { + for (int i = 0; i < sheepArray.size(); i++) { + sheepArray.get(i).remove(); + } + sheepArray.clear(); + } - // Cycle colours of all sheep in the array - void cycleSheepColours() { - for (int i = 0; i < sheepArray.size(); i++) { - //sheepArray.get(i) something something - } - } + // Cycle colours of all sheep in the array + void cycleSheepColours() { + for (int i = 0; i < sheepArray.size(); i++) { + //sheepArray.get(i) something something + } + } - void playSounds() { - // TODO: generate list of players to send sounds to - } + void playSounds() { + // TODO: generate list of players to send sounds to + } - void playSounds(Player player) { - //TODO: Add sound playing here - } + void playSounds(Player player) { + //TODO: Add sound playing here + } - // Called after discosheep is stopped - void cleanUp() { - removeAllSheep(); - } + // Called after discosheep is stopped + void cleanUp() { + removeAllSheep(); + } - void scheduleUpdate() { - updater.runTaskLater((Plugin) updater, updater.frequency); - } + void scheduleUpdate() { + updater.runTaskLater((Plugin) updater, updater.frequency); + } - void startDisco(int frequency, int duration) { - updater.start(frequency, duration); - } + void startDisco(int frequency, int duration) { + updater.start(frequency, duration); + } - void startDisco() { - this.startDisco(); - } + void startDisco() { + this.startDisco(); + } - void stopDisco() { - updater.stop(); - } + void stopDisco() { + updater.stop(); + } } diff --git a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java index 10c6e7e..f81a1b1 100644 --- a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java +++ b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java @@ -4,19 +4,17 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.CommandExecutor; - public class DiscoSheepCommandExecutor implements CommandExecutor { - - private DiscoSheep parent; - - public DiscoSheepCommandExecutor(DiscoSheep parent) { - this.parent = parent; - } - - @Override - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - - return true; - } - + + private DiscoSheep parent; + + public DiscoSheepCommandExecutor(DiscoSheep parent) { + this.parent = parent; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + + return true; + } } diff --git a/src/gibstick/bukkit/discosheep/DiscoUpdater.java b/src/gibstick/bukkit/discosheep/DiscoUpdater.java index 2c059ee..cf6ff55 100644 --- a/src/gibstick/bukkit/discosheep/DiscoUpdater.java +++ b/src/gibstick/bukkit/discosheep/DiscoUpdater.java @@ -4,35 +4,35 @@ import org.bukkit.scheduler.BukkitRunnable; public class DiscoUpdater extends BukkitRunnable { - private final int defaultDuration = 1000;// ticks - private final int defaultFrequency = 20;// ticks per state change - int frequency = 0, duration = 0; - private DiscoSheep parent; + private final int defaultDuration = 1000;// ticks + private final int defaultFrequency = 20;// ticks per state change + int frequency = 0, duration = 0; + private DiscoSheep parent; - public DiscoUpdater(DiscoSheep parent) { - this.parent = parent; - } + public DiscoUpdater(DiscoSheep parent) { + this.parent = parent; + } - public void stop() { - this.duration = 0; - parent.cleanUp(); - } + public void stop() { + this.duration = 0; + parent.cleanUp(); + } - public void start(int duration, int frequency) { - this.frequency = this.defaultFrequency; - this.duration = this.defaultDuration; - parent.scheduleUpdate(); - } + public void start(int duration, int frequency) { + this.frequency = this.defaultFrequency; + this.duration = this.defaultDuration; + parent.scheduleUpdate(); + } - @Override - public void run() { - if (duration > 0) { - parent.cycleSheepColours(); - parent.playSounds(); - duration -= frequency; - parent.scheduleUpdate(); - } else { - this.stop(); - } - } + @Override + public void run() { + if (duration > 0) { + parent.cycleSheepColours(); + parent.playSounds(); + duration -= frequency; + parent.scheduleUpdate(); + } else { + this.stop(); + } + } }