Permalink
Browse files

moving to gradle

  • Loading branch information...
jimnordb committed Apr 25, 2014
1 parent 533bcca commit 2dad88d7eadb044d74ba52b602ca64acaee5d757
Showing with 354 additions and 219 deletions.
  1. +6 −4 .gitignore
  2. +13 −0 .settings/org.eclipse.jdt.core.prefs
  3. +41 −0 build.gradle
  4. +0 −205 build.xml
  5. BIN deps/industrialcraft-2-dev-deobf_2.0.397-experimental.jar
  6. BIN gradle/wrapper/gradle-wrapper.jar
  7. +6 −0 gradle/wrapper/gradle-wrapper.properties
  8. +164 −0 gradlew
  9. +90 −0 gradlew.bat
  10. BIN {resources → }/recipear.png
  11. BIN {resources → }/recipear.psd
  12. 0 src/{ → main/java}/mods/recipear/BannedRecipe.java
  13. 0 src/{ → main/java}/mods/recipear/BannedRecipes.java
  14. 0 src/{ → main/java}/mods/recipear/ConfigPacket.java
  15. 0 src/{ → main/java}/mods/recipear/ConnectionHandler.java
  16. 0 src/{ → main/java}/mods/recipear/PacketManager.java
  17. 0 src/{ → main/java}/mods/recipear/Recipear.java
  18. 0 src/{ → main/java}/mods/recipear/RecipearClientProxy.java
  19. +6 −0 src/{ → main/java}/mods/recipear/RecipearCommand.java
  20. 0 src/{ → main/java}/mods/recipear/RecipearCommonProxy.java
  21. 0 src/{ → main/java}/mods/recipear/RecipearConfig.java
  22. 0 src/{ → main/java}/mods/recipear/RecipearFormatter.java
  23. 0 src/{ → main/java}/mods/recipear/RecipearLogger.java
  24. 0 src/{ → main/java}/mods/recipear/RecipearOutput.java
  25. 0 src/{ → main/java}/mods/recipear/RecipearPlayerTick.java
  26. 0 src/{ → main/java}/mods/recipear/RecipearPlayerTracker.java
  27. 0 src/{ → main/java}/mods/recipear/RecipearTooltip.java
  28. +11 −0 src/{ → main/java}/mods/recipear/RecipearUtil.java
  29. 0 src/{ → main/java}/mods/recipear/api/IRecipear.java
  30. 0 src/{ → main/java}/mods/recipear/api/RecipearEvent.java
  31. 0 src/{ → main/java}/mods/recipear/api/RecipearListener.java
  32. +8 −1 src/{ → main/java}/mods/recipear/modules/RecipearIC2.java
  33. +3 −3 src/{ → main/java}/mods/recipear/modules/RecipearTC4.java
  34. +2 −2 src/{ → main/java}/mods/recipear/modules/RecipearVanilla.java
  35. 0 src/{ → main/java}/thaumcraft/api/IGoggles.java
  36. 0 src/{ → main/java}/thaumcraft/api/IRepairable.java
  37. 0 src/{ → main/java}/thaumcraft/api/IRepairableExtended.java
  38. 0 src/{ → main/java}/thaumcraft/api/IScribeTools.java
  39. 0 src/{ → main/java}/thaumcraft/api/IVisDiscountGear.java
  40. 0 src/{ → main/java}/thaumcraft/api/IVisDiscounter.java
  41. 0 src/{ → main/java}/thaumcraft/api/ItemApi.java
  42. 0 src/{ → main/java}/thaumcraft/api/LICENSE
  43. 0 src/{ → main/java}/thaumcraft/api/README.md
  44. 0 src/{ → main/java}/thaumcraft/api/ThaumcraftApi.java
  45. 0 src/{ → main/java}/thaumcraft/api/ThaumcraftApiHelper.java
  46. 0 src/{ → main/java}/thaumcraft/api/aspects/Aspect.java
  47. 0 src/{ → main/java}/thaumcraft/api/aspects/AspectList.java
  48. 0 src/{ → main/java}/thaumcraft/api/aspects/AspectSourceHelper.java
  49. 0 src/{ → main/java}/thaumcraft/api/aspects/IAspectContainer.java
  50. 0 src/{ → main/java}/thaumcraft/api/aspects/IAspectSource.java
  51. 0 src/{ → main/java}/thaumcraft/api/aspects/IEssentiaContainerItem.java
  52. 0 src/{ → main/java}/thaumcraft/api/aspects/IEssentiaTransport.java
  53. 0 src/{ → main/java}/thaumcraft/api/crafting/CrucibleRecipe.java
  54. 0 src/{ → main/java}/thaumcraft/api/crafting/IArcaneRecipe.java
  55. 0 src/{ → main/java}/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
  56. 0 src/{ → main/java}/thaumcraft/api/crafting/InfusionRecipe.java
  57. 0 src/{ → main/java}/thaumcraft/api/crafting/ShapedArcaneRecipe.java
  58. 0 src/{ → main/java}/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
  59. 0 src/{ → main/java}/thaumcraft/api/nodes/INode.java
  60. 0 src/{ → main/java}/thaumcraft/api/nodes/IRevealer.java
  61. 0 src/{ → main/java}/thaumcraft/api/nodes/NodeModifier.java
  62. 0 src/{ → main/java}/thaumcraft/api/nodes/NodeType.java
  63. 0 src/{ → main/java}/thaumcraft/api/research/IScanEventHandler.java
  64. 0 src/{ → main/java}/thaumcraft/api/research/ResearchCategories.java
  65. 0 src/{ → main/java}/thaumcraft/api/research/ResearchCategoryList.java
  66. 0 src/{ → main/java}/thaumcraft/api/research/ResearchItem.java
  67. 0 src/{ → main/java}/thaumcraft/api/research/ResearchPage.java
  68. 0 src/{ → main/java}/thaumcraft/api/research/ScanResult.java
  69. 0 src/{ → main/java}/thaumcraft/api/wands/IWandFocus.java
  70. 0 src/{ → main/java}/thaumcraft/api/wands/IWandRodOnUpdate.java
  71. 0 src/{ → main/java}/thaumcraft/api/wands/IWandTriggerManager.java
  72. 0 src/{ → main/java}/thaumcraft/api/wands/IWandable.java
  73. 0 src/{ → main/java}/thaumcraft/api/wands/ItemFocusBasic.java
  74. 0 src/{ → main/java}/thaumcraft/api/wands/StaffRod.java
  75. 0 src/{ → main/java}/thaumcraft/api/wands/WandCap.java
  76. 0 src/{ → main/java}/thaumcraft/api/wands/WandRod.java
  77. 0 src/{ → main/java}/thaumcraft/api/wands/WandTriggerRegistry.java
  78. +4 −4 { → src/main}/resources/mcmod.info
  79. BIN src/main/resources/recipear.png
View
@@ -1,5 +1,7 @@
/build/
/download/
/distribute/
build/
distribute/
eclipse/
.gradle/
.project
.classpath
.project
.classpath
@@ -0,0 +1,13 @@
#
#Fri Apr 25 17:49:50 CEST 2014
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
View
@@ -0,0 +1,41 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
}
}
apply plugin: 'forge'
version = "2.3"
group= "mods.recipear"
archivesBaseName = "Recipear2"
dependencies {
compile fileTree(dir:'deps',include:'*.jar')
}
minecraft {
version = "1.6.4-9.11.1.964"
}
processResources
{
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
View
205 build.xml
@@ -1,205 +0,0 @@
<!-- Originally built on BuildCraft build.xml, Modified by TinkersConstruct and then modified by Silentspy :P -->
<project name="Recipear2" default="main">
<property environment="env"/>
<!-- Properties -->
<property name="build.dir" value="build"/>
<property name="src.dir" value="src"/>
<property name="resources.dir" value="resources"/>
<property name="download.dir" value="download"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="distribute.dir" value="distribute"/>
<property name="forge.dir" value="${build.dir}/forge"/>
<property name="mcp.dir" value="${forge.dir}/mcp"/>
<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
<property name="mc.version" value="1.6.4"/>
<property name="forge.version" value="9.11.1.965"/>
<property name="ic2exp.version" value="397"/>
<property name="recipear.version" value="2.3.0" />
<property name="forge.name" value="forge-${mc.version}-${forge.version}-src.zip"/>
<property name="ic2.name" value="industrialcraft-2-dev-deobf_2.0.${ic2exp.version}-experimental.jar"/>
<property name="ic2.url" value="http://ic2api.player.to:8080/job/IC2_experimental/${ic2exp.version}/artifact/packages/"/>
<available property="forge-exists" file="${download.dir}/${forge.name}"/>
<available property="ic2-exists" file="${download.dir}/${ic2.name}"/>
<available file=".git" type="dir" property="git.present"/>
<condition property="out-of-date">
<not>
<and>
<available file="${download.dir}/${forge.name}"/>
<available file="${mcpsrc.dir}"/>
<available file="${download.dir}/${ic2.name}"/>
</and>
</not>
</condition>
<mkdir dir="${download.dir}"/>
<!-- Targets -->
<!-- Clear build directory -->
<target name="clean">
<delete dir="${build.dir}"/>
</target>
<!-- Set full version -->
<target name="initialize-version" depends="version-provided,version-not-provided,git-revision">
<property name="project.version.full" value="${recipear.version}-${build.number}"/>
</target>
<!-- Set unknown build number -->
<target name="version-not-provided" unless="env.BUILD_NUMBER">
<property name="build.number" value="DEV"/>
</target>
<!-- Set build number from environment -->
<target name="version-provided" if="env.BUILD_NUMBER">
<property name="build.number" value="b${env.BUILD_NUMBER}"/>
</target>
<!-- Check with git and fetch a revision -->
<target name="git-revision" if="git.present">
<exec executable="git" dir="." outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
<arg value="rev-parse"/>
<arg value="--short"/>
<arg value="HEAD"/>
</exec>
<echo message="Git revision: ${git.revision}"/>
</target>
<!-- Download necessary files -->
<target name="download-files" depends="download-forge,download-ic2"/>
<!-- Download forge (if it doesn't exist) -->
<target name="download-forge" unless="forge-exists">
<get src="http://files.minecraftforge.net/maven/net/minecraftforge/forge/${mc.version}-${forge.version}/${forge.name}" dest="${download.dir}" usetimestamp="True"/>
</target>
<!-- Download IC2 unless it exists -->
<target name="download-ic2" unless="ic2-exists">
<get src="${ic2.url}${ic2.name}" dest="${download.dir}" usetimestamp="True"/>
</target>
<!-- Setup mcp and forge -->
<target name="setup" depends="download-files" if="out-of-date">
<delete dir="${forge.dir}" failonerror="false"/>
<unzip dest="${forge.dir}/.." src="${download.dir}/${forge.name}"/>
<!-- Fix executable permissions -->
<chmod dir="${forge.dir}" perm="ugo+rx" includes="**.sh"/>
<!-- Install forge -->
<exec dir="${forge.dir}" executable="${forge.dir}/fml/python/python_fml" osfamily="windows">
<arg line="install.py --no-assets"/>
</exec>
<exec dir="${forge.dir}" executable="python" osfamily="unix">
<arg line="install.py --no-assets"/>
</exec>
</target>
<target name="change-debug-boolean">
<replace file="${mcpsrc.dir}/minecraft/mods/recipear/Recipear.java" token="public static boolean debug = true;" value="public static boolean debug = false;" />
</target>
<target name="copy-src">
<!-- Copy sources -->
<copy todir="${mcpsrc.dir}/minecraft">
<fileset dir="${src.dir}"/>
<filterset>
<filter token="VERSION" value="${project.version.full}" />
</filterset>
</copy>
</target>
<target name="copy-ic2">
<delete>
<fileset dir="${mcp.dir}/lib" includes="industrialcraft-2-dev-deobf*.jar"/>
</delete>
<!-- Copy sources -->
<copy todir="${mcp.dir}/lib">
<fileset dir="${download.dir}" includes="industrialcraft-2-dev-deobf*.jar"/>
</copy>
</target>
<target name="compile" depends="initialize-version,setup,copy-src,copy-ic2,change-debug-boolean">
<delete dir="${classes.dir}"/>
<mkdir dir="${classes.dir}"/>
<!-- Recompile -->
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
<arg line="/c recompile.bat"/>
</exec>
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
<arg value="recompile.sh"/>
</exec>
<!-- Check for failure -->
<fail message="MCP failed to build">
<condition>
<resourcecontains resource="${mcp.dir}/logs/client_compile.log" substring="error:"/>
</condition>
</fail>
</target>
<target name="reobf" depends="compile">
<!-- Reobfuscate -->
<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
<arg line="/c reobfuscate_srg.bat"/>
</exec>
<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
<arg value="reobfuscate_srg.sh"/>
</exec>
<!-- Copy classes -->
<copy todir="${classes.dir}">
<fileset dir="${mcp.dir}/reobf/minecraft"/>
</copy>
<!-- Copy resources -->
<copy todir="${classes.dir}" outputencoding="UTF-8">
<fileset dir="${classes.dir}">
</fileset>
</copy>
<copy file="${resources.dir}/mcmod.info" todir="${classes.dir}" outputencoding="UTF-8">
<filterset>
<filter token="VERSION" value="${project.version.full}" />
<filter token="MCVERSION" value="${mc.version}" />
</filterset>
</copy>
<copy todir="${classes.dir}">
<fileset dir="${resources.dir}">
<exclude name="mcmod.info"/>
</fileset>
</copy>
<!-- Reset src dir to post-forge-install state -->
<delete dir="${mcpsrc.dir}/minecraft/mods"/>
<delete dir="${mcpsrc.dir}/minecraft/ic2"/>
<delete dir="${distribute.dir}"/>
<mkdir dir="${distribute.dir}"/>
</target>
<!-- Package the compiled files -->
<target name="package" depends="reobf,pack-src">
<jar destfile="${distribute.dir}/Recipear2-${mc.version}-${project.version.full}.jar" basedir="${classes.dir}"/>
</target>
<!-- Package SRC -->
<target name="pack-src">
<zip destfile="${distribute.dir}/Recipear2-${mc.version}-${project.version.full}-src.zip" basedir="${src.dir}"/>
</target>
<!-- Default target to run -->
<target name="main" depends="package"/>
</project>
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,6 @@
#Tue Oct 29 18:00:54 CDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
Oops, something went wrong.

0 comments on commit 2dad88d

Please sign in to comment.