Skip to content

Commit

Permalink
Added a submodule reference to BlockBreakEvent, to allow for better
Browse files Browse the repository at this point in the history
integration when doing the automatic build.
  • Loading branch information
keepcalm committed Dec 18, 2012
1 parent c768154 commit 6637772
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "blockbreak"]
path = blockbreak
url = git://github.com/keepcalm/BlockBreak
1 change: 1 addition & 0 deletions blockbreak
Submodule blockbreak added at 4bbfab
15 changes: 12 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions src/keepcalm/mods/bukkit/BukkitContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6637772

Please sign in to comment.