From 4c05c5d2d3ba000776be2084f556aa8dffb0162a Mon Sep 17 00:00:00 2001
From: Charlie <gibsticker@gmail.com>
Date: Thu, 31 Jul 2014 19:49:47 -0400
Subject: [PATCH] disco floor is back; fixed name

---
 build.xml                                  | 73 ++++++++++++++++++++++
 src/ca/gibstick/discosheep/DiscoParty.java | 12 ++--
 2 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 build.xml

diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..67e8850
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="DiscoSheep" default="default" basedir=".">
+    <description>Builds, tests, and runs the project DiscoSheep.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="DiscoSheep-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/src/ca/gibstick/discosheep/DiscoParty.java b/src/ca/gibstick/discosheep/DiscoParty.java
index d232505..f41ad54 100644
--- a/src/ca/gibstick/discosheep/DiscoParty.java
+++ b/src/ca/gibstick/discosheep/DiscoParty.java
@@ -275,8 +275,8 @@ public class DiscoParty {
             }
         }
 
-        //loc = player.getLocation();
-        //this.spawnFloor(world, new Location(world, loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()));
+        loc = player.getLocation();
+        this.spawnFloor(world, new Location(world, loc.getBlockX(), loc.getBlockY() - 1, loc.getBlockZ()));
     }
 
     void spawnSheep(World world, Location loc) {
@@ -290,7 +290,7 @@ public class DiscoParty {
             world.strikeLightningEffect(loc);
         }
         newSheep.setCustomName("jeb_");
-        newSheep.setCustomNameVisible(true);
+        newSheep.setCustomNameVisible(false);
         newSheep.setRemoveWhenFarAway(false);
     }
 
@@ -434,9 +434,9 @@ public class DiscoParty {
             }
         }
 
-        /*		for (Block block : this.floorBlocks) {
-         this.randomizeFloor(block);
-         }*/
+        for (Block block : this.floorBlocks) {
+            this.randomizeFloor(block);
+        }
     }
 
     private float getPentatonicNote() {