From 66377726fa0b3027502d6bbad517ca3d88967f37 Mon Sep 17 00:00:00 2001
From: keepcalm <keepcalm20687@gmail.com>
Date: Tue, 18 Dec 2012 17:26:17 +1100
Subject: [PATCH] Added a submodule reference to BlockBreakEvent, to allow for
 better integration when doing the automatic build.

---
 .gitmodules                                   |   3 +++
 blockbreak                                    |   1 +
 build.xml                                     |  15 ++++++++++++---
 lib/{ => api}/bukkitAPI.jar                   | Bin
 src/keepcalm/mods/bukkit/BukkitContainer.java |   2 ++
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 blockbreak
 rename lib/{ => api}/bukkitAPI.jar (100%)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a25da49
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "blockbreak"]
+	path = blockbreak
+	url = git://github.com/keepcalm/BlockBreak
diff --git a/blockbreak b/blockbreak
new file mode 160000
index 0000000..4bbfabf
--- /dev/null
+++ b/blockbreak
@@ -0,0 +1 @@
+Subproject commit 4bbfabfd444e98b03bc9a962f55e4eeaca954c5a
diff --git a/build.xml b/build.xml
index 13d812c..103211d 100644
--- a/build.xml
+++ b/build.xml
@@ -88,7 +88,7 @@
 	</target>
 	<target name="setup-forge" depends="download-forge,build-number-there,build-number-not-there">
                  
-    <property name="build.full-version" value="${build.ver}-${build.number}" />
+    		<property name="build.full-version" value="${build.ver}-${build.number}" />
 		        <unzip dest="${build.dir}">
 		            <fileset dir="${download.dir}">
 		                <include name="minecraftforge-src-${forge.version}.zip"/>
@@ -131,10 +131,19 @@
 			<copy todir="${mcpsrc.dir}">
 				<fileset dir="${src.dir}/javax" />
 			</copy>
+			
 			<copy todir="${mcpsrc.dir}/org">
 				   <fileset dir="${src.dir}/org/bukkit" />
-	             	</copy>
-		            	
+			   </copy>
+
+			   <!-- Copy libraries -->
+			   <copy todir="${mcp.dir}/lib" >
+				   <fileset dir="lib" >
+					   <patternset includes="*.jar" />
+				   </fileset>
+			   
+			   </copy>
+
 	</target>
 		
 	<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
diff --git a/lib/bukkitAPI.jar b/lib/api/bukkitAPI.jar
similarity index 100%
rename from lib/bukkitAPI.jar
rename to lib/api/bukkitAPI.jar
diff --git a/src/keepcalm/mods/bukkit/BukkitContainer.java b/src/keepcalm/mods/bukkit/BukkitContainer.java
index b5132a4..e544da0 100644
--- a/src/keepcalm/mods/bukkit/BukkitContainer.java
+++ b/src/keepcalm/mods/bukkit/BukkitContainer.java
@@ -37,11 +37,13 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 //import net.minecraftforge.event.EventBus;
 //import net.minecraftforge.event.EventBus;
 
 @Mod(modid="BukkitForge",name="BukkitForge",version="1.4.5-3")
+@NetworkMod(clientSideRequired=false,serverSideRequired=false)
 public class BukkitContainer {
 	public static BukkitServer bServer;
 	public File myConfigurationFile;