Readded Calclavia Core
This commit is contained in:
parent
44e1bd3d07
commit
6acb127517
5 changed files with 22 additions and 18 deletions
8
.gitmodules
vendored
8
.gitmodules
vendored
|
@ -1,6 +1,6 @@
|
|||
[submodule "Calclavia-Library"]
|
||||
path = Calclavia-Library
|
||||
url=git@bitbucket.org:calclavia/calclavia-core.git
|
||||
[submodule "Universal-Electricity"]
|
||||
path = Universal-Electricity
|
||||
url = https://github.com/Universal-Electricity/Universal-Electricity
|
||||
url = https://github.com/Universal-Electricity/Universal-Electricity
|
||||
[submodule "Calclavia-Core"]
|
||||
path = Calclavia-Core
|
||||
url = git@bitbucket.org:calclavia/calclavia-core.git
|
||||
|
|
1
Calclavia-Core
Submodule
1
Calclavia-Core
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 4e65ff34d0130a64599f0d51a6ff8de270148928
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 2f826fe8b0c154a84229357be699da765e5d244a
|
28
build.xml
28
build.xml
|
@ -10,22 +10,21 @@
|
|||
<property name="file.apifile" value="Resonant-Induction-api-v${version.mod.major}.${version.mod.minor}.${version.mod.revis}.${env.BUILD_NUMBER}.zip" />
|
||||
|
||||
<target name="build">
|
||||
|
||||
<copy todir="${dir.development}">
|
||||
<fileset dir="../Minecraft Forge Latest/" />
|
||||
</copy>
|
||||
|
||||
|
||||
<get src="http://files.minecraftforge.net/CodeChickenLib/CodeChickenLib-dev-1.6.4-1.0.0.49.jar"
|
||||
dest="${dir.mcp}/lib/CCL-dev.jar"/>
|
||||
<get src="http://files.minecraftforge.net/ForgeMultipart/ForgeMultipart-dev-1.6.4-1.0.0.227.jar"
|
||||
dest="${dir.mcp}/lib/FMP-dev.jar"/>
|
||||
|
||||
<copy todir="${dir.mcp}/src/minecraft">
|
||||
<fileset dir="${dir.development}src">
|
||||
<fileset dir="${dir.development}src/main/java/">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
<fileset dir="${dir.development}Calclavia-Library/src/main/java">
|
||||
<fileset dir="${dir.development}Calclavia-Core/src/main/java/">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
|
@ -35,8 +34,6 @@
|
|||
</fileset>
|
||||
</copy>
|
||||
|
||||
<mkdir dir="output" />
|
||||
|
||||
<replace dir="${dir.mcp}/src/minecraft" token="@MAJOR@" value="${version.mod.major}" />
|
||||
<replace dir="${dir.mcp}/src/minecraft" token="@MINOR@" value="${version.mod.minor}" />
|
||||
<replace dir="${dir.mcp}/src/minecraft" token="@REVIS@" value="${version.mod.revis}" />
|
||||
|
@ -62,13 +59,20 @@
|
|||
<exec dir="${dir.mcp}" executable="bash" osfamily="unix">
|
||||
<arg line="reobfuscate_srg.sh" />
|
||||
</exec>
|
||||
|
||||
<copy todir="JarContents">
|
||||
|
||||
<copy todir="ModContents">
|
||||
<fileset dir="${dir.mcp}/reobf/minecraft">
|
||||
<include name="resonantinduction/**"/>
|
||||
</fileset>
|
||||
|
||||
<fileset dir="${dir.development}resources">
|
||||
|
||||
<!-- Copy all resources -->
|
||||
<fileset dir="${dir.development}src/main/resources">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.java"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
</fileset>
|
||||
|
||||
<fileset dir="${dir.development}Calclavia-Core/src/main/resources/">
|
||||
<exclude name=".git/**"/>
|
||||
<exclude name="**/*.java"/>
|
||||
<exclude name="**/*.xml"/>
|
||||
|
@ -80,7 +84,7 @@
|
|||
</copy>
|
||||
|
||||
<jar destfile="output/${file.mainfile}">
|
||||
<fileset dir="JarContents" />
|
||||
<fileset dir="ModContents" />
|
||||
</jar>
|
||||
<zip destfile="output/${file.apifile}">
|
||||
<fileset dir="APIContents" />
|
||||
|
@ -90,7 +94,7 @@
|
|||
|
||||
<!-- OUTPUT LATEST JAR AND ZIP FILES -->
|
||||
<jar destfile="${file.main}">
|
||||
<fileset dir="JarContents" />
|
||||
<fileset dir="ModContents" />
|
||||
</jar>
|
||||
|
||||
<!--
|
||||
|
|
|
@ -34,7 +34,7 @@ import resonantinduction.tesla.TileTesla;
|
|||
import resonantinduction.transformer.ItemTransformer;
|
||||
import resonantinduction.wire.EnumWireMaterial;
|
||||
import resonantinduction.wire.ItemWire;
|
||||
import calclavia.components.api.BasicRegistry;
|
||||
import calclavia.components.BasicRegistry;
|
||||
import calclavia.lib.UniversalRecipe;
|
||||
import calclavia.lib.network.PacketHandler;
|
||||
import calclavia.lib.network.PacketTile;
|
||||
|
|
Loading…
Reference in a new issue