Browse Source

Add more eclipse launches to launch without mods but NEI

OvermindDL1 3 years ago
parent
commit
b23d20202f

+ 1
- 0
.gitignore View File

@@ -19,6 +19,7 @@
19 19
 
20 20
 # Build files
21 21
 !/build.gradle
22
+!/settings.gradle
22 23
 !/gradlew
23 24
 !/gradlew.bat
24 25
 !/gradle/wrapper/gradle-wrapper.jar

.meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch → .meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client-Full.launch View File

@@ -1,10 +1,15 @@
1 1
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 2
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
3 3
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
4
-<listEntry value="/Minecraft/lib/net/minecraft/launchwrapper/1.8/launchwrapper-1.8.jar"/>
4
+<listEntry value="/Minecraft"/>
5 5
 </listAttribute>
6 6
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
7
-<listEntry value="1"/>
7
+<listEntry value="4"/>
8
+</listAttribute>
9
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
10
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
11
+<listEntry value="org.eclipse.eclemma.ui.launchGroup.coverage"/>
12
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
8 13
 </listAttribute>
9 14
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
10 15
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>

+ 23
- 0
.meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client-Minimal.launch View File

@@ -0,0 +1,23 @@
1
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
3
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
4
+<listEntry value="/Minecraft"/>
5
+</listAttribute>
6
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
7
+<listEntry value="4"/>
8
+</listAttribute>
9
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
10
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
11
+<listEntry value="org.eclipse.eclemma.ui.launchGroup.coverage"/>
12
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
13
+</listAttribute>
14
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
15
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;Minecraft&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
16
+@@eclipseRuntimeClasspath@@</listAttribute>
17
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
18
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
19
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
20
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx4096M -Xms1024M"/>
21
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
22
+</launchConfiguration>
23
+

.meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch → .meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server-Full.launch View File

@@ -6,6 +6,11 @@
6 6
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
7 7
 <listEntry value="1"/>
8 8
 </listAttribute>
9
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
10
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
11
+<listEntry value="org.eclipse.eclemma.ui.launchGroup.coverage"/>
12
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
13
+</listAttribute>
9 14
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
10 15
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
11 16
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx4096M -Xms1024M"/>

+ 23
- 0
.meta/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server-Minimal.launch View File

@@ -0,0 +1,23 @@
1
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
3
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
4
+<listEntry value="/Minecraft/src/net/minecraft/server/MinecraftServer.java"/>
5
+</listAttribute>
6
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
7
+<listEntry value="1"/>
8
+</listAttribute>
9
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
10
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
11
+<listEntry value="org.eclipse.eclemma.ui.launchGroup.coverage"/>
12
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
13
+</listAttribute>
14
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
15
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;Minecraft&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
16
+@@eclipseRuntimeClasspath@@</listAttribute>
17
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
18
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
19
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
20
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx4096M -Xms1024M"/>
21
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
22
+</launchConfiguration>
23
+

+ 44
- 20
build.gradle View File

@@ -30,9 +30,15 @@ eclipse {
30 30
 	}
31 31
 }
32 32
 
33
+// This is filled out lower down in the file
34
+def eclipseRuntimeClasspath = ""
35
+def eclipseRuntimeClasspathTemplate = "<listEntry value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;@@PATH@@&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;\"/>\n"
36
+
33 37
 task eclipseForgeWorkspace(type: Copy) {
34 38
 	from ".meta/eclipse/.metadata"
35 39
 	into "eclipse/.metadata"
40
+	// This must remain in a closure to run after the lower file block is run
41
+	filter { it.replaceAll('@@eclipseRuntimeClasspath@@', eclipseRuntimeClasspath) }
36 42
 }
37 43
 
38 44
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -128,31 +134,49 @@ minecraft {
128 134
 
129 135
 dependencies {
130 136
 	//compile fileTree(dir: 'libs', include: '*.jar')
131
-	compile "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
132
-	compile "com.mod-buildcraft:buildcraft:7.1.23:dev"
133
-	compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
134
-	compile "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
135
-	compile "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
136
-	compile "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"
137 137
 	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
138 138
 	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
139 139
 	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
140
-	compile "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
141
-	compile "enviromine:EnviroMine:1.3.124:deobf"
142
-	compile "vazkii.botania:Botania:r1.8-250:deobf"
143
-	compile "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
144
-	compile "twilightforest:twilightforest:1.7.10-2.3.8dev:dev"
145
-	compile "appeng:appliedenergistics2:rv3-beta-6:dev"
146
-	compile "cofh:CoFHLib:1.7.10R3.0.3:dev"
147
-	compile "applecore:AppleCore:1.7.10-3.1.1:deobf"
148
-	compile "li.cil.oc:OpenComputers:MC1.7.10-1.7.2.1204:dev"
140
+	compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
141
+	compileOnly "com.mod-buildcraft:buildcraft:7.1.23:dev"
142
+	compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
143
+	compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
144
+	compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
145
+	compileOnly "micdoodle8.mods:Galacticraft-Planets:1.7-3.0.12.504:Dev"
146
+	compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
147
+	compileOnly "enviromine:EnviroMine:1.3.124:deobf"
148
+	compileOnly "vazkii.botania:Botania:r1.8-250:deobf"
149
+	compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
150
+	compileOnly "twilightforest:twilightforest:1.7.10-2.3.8dev:dev"
151
+	compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
152
+	compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
153
+	compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
154
+	compileOnly "li.cil.oc:OpenComputers:MC1.7.10-1.7.2.1204:dev"
149 155
 	// This ComputerCraft thing is *SUCH* a hack, but ComputerCraft is... not
150 156
 	// right...  This only works because of CodeChickenCore Magic being included
151 157
 	// up above...
152
-	compile "dan200.computercraft:ComputerCraft:1.75"
153
-	compile "openblocks:OpenBlocks:1.7.10-1.6-1.7.10:deobf"
154
-	compile "openmods:OpenModsLib:1.7.10-0.10:deobf"
155
-	compile "ic2:IC2Classic:1.2.1.8:dev"
158
+	compileOnly "dan200.computercraft:ComputerCraft:1.75" 
159
+	compileOnly "openblocks:OpenBlocks:1.7.10-1.6-1.7.10:deobf"
160
+	compileOnly "openmods:OpenModsLib:1.7.10-0.10:deobf"
161
+	compileOnly "ic2:IC2Classic:1.2.1.8:dev"
162
+}
163
+
164
+runClient {
165
+	jvmArgs "-Xms4096m", "-Xms1024m"
166
+}
167
+
168
+runServer {
169
+	jvmArgs "-Xms4096m", "-Xms1024m"
170
+}
171
+
172
+// Yes this has to be down here for some reason...
173
+afterEvaluate {
174
+	//println sourceSets
175
+	sourceSets.main.runtimeClasspath.each {
176
+		println it
177
+		eclipseRuntimeClasspath += eclipseRuntimeClasspathTemplate.replaceAll('@@PATH@@', it.toString())
178
+	}
179
+	println eclipseRuntimeClasspath
156 180
 }
157 181
 
158 182
 processResources {
@@ -166,7 +190,7 @@ processResources {
166 190
 }
167 191
 
168 192
 task wrapper(type: Wrapper) {
169
-	gradleVersion = '2.13'
193
+	gradleVersion = '2.14.1'
170 194
 }
171 195
 
172 196
 task sourceJar(type: Jar) {

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 2
- 2
gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +1,6 @@
1
-#Wed Jul 02 15:54:47 CDT 2014
1
+#Tue Sep 18 14:32:10 MDT 2018
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

+ 27
- 28
gradlew View File

@@ -6,31 +6,49 @@
6 6
 ##
7 7
 ##############################################################################
8 8
 
9
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10
-DEFAULT_JVM_OPTS=""
9
+# Attempt to set APP_HOME
10
+# Resolve links: $0 may be a link
11
+PRG="$0"
12
+# Need this for relative symlinks.
13
+while [ -h "$PRG" ] ; do
14
+    ls=`ls -ld "$PRG"`
15
+    link=`expr "$ls" : '.*-> \(.*\)$'`
16
+    if expr "$link" : '/.*' > /dev/null; then
17
+        PRG="$link"
18
+    else
19
+        PRG=`dirname "$PRG"`"/$link"
20
+    fi
21
+done
22
+SAVED="`pwd`"
23
+cd "`dirname \"$PRG\"`/" >/dev/null
24
+APP_HOME="`pwd -P`"
25
+cd "$SAVED" >/dev/null
11 26
 
12 27
 APP_NAME="Gradle"
13 28
 APP_BASE_NAME=`basename "$0"`
14 29
 
30
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31
+DEFAULT_JVM_OPTS=""
32
+
15 33
 # Use the maximum available, or set MAX_FD != -1 to use that value.
16 34
 MAX_FD="maximum"
17 35
 
18 36
 warn ( ) {
19 37
     echo "$*"
20
-    read -n1 -r -p "Press any key to continue..."
21 38
 }
22 39
 
23 40
 die ( ) {
24 41
     echo
25 42
     echo "$*"
26 43
     echo
27
-    read -n1 -r -p "Press any key to continue..."
44
+    exit 1
28 45
 }
29 46
 
30 47
 # OS specific support (must be 'true' or 'false').
31 48
 cygwin=false
32 49
 msys=false
33 50
 darwin=false
51
+nonstop=false
34 52
 case "`uname`" in
35 53
   CYGWIN* )
36 54
     cygwin=true
@@ -41,31 +59,11 @@ case "`uname`" in
41 59
   MINGW* )
42 60
     msys=true
43 61
     ;;
62
+  NONSTOP* )
63
+    nonstop=true
64
+    ;;
44 65
 esac
45 66
 
46
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
47
-if $cygwin ; then
48
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
49
-fi
50
-
51
-# Attempt to set APP_HOME
52
-# Resolve links: $0 may be a link
53
-PRG="$0"
54
-# Need this for relative symlinks.
55
-while [ -h "$PRG" ] ; do
56
-    ls=`ls -ld "$PRG"`
57
-    link=`expr "$ls" : '.*-> \(.*\)$'`
58
-    if expr "$link" : '/.*' > /dev/null; then
59
-        PRG="$link"
60
-    else
61
-        PRG=`dirname "$PRG"`"/$link"
62
-    fi
63
-done
64
-SAVED="`pwd`"
65
-cd "`dirname \"$PRG\"`/" >&-
66
-APP_HOME="`pwd -P`"
67
-cd "$SAVED" >&-
68
-
69 67
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
70 68
 
71 69
 # Determine the Java command to use to start the JVM.
@@ -91,7 +89,7 @@ location of your Java installation."
91 89
 fi
92 90
 
93 91
 # Increase the maximum file descriptors if we can.
94
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
95 93
     MAX_FD_LIMIT=`ulimit -H -n`
96 94
     if [ $? -eq 0 ] ; then
97 95
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -115,6 +113,7 @@ fi
115 113
 if $cygwin ; then
116 114
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
117 115
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116
+    JAVACMD=`cygpath --unix "$JAVACMD"`
118 117
 
119 118
     # We build the pattern for arguments to be converted via cygpath
120 119
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

+ 4
- 4
gradlew.bat View File

@@ -8,14 +8,14 @@
8 8
 @rem Set local scope for the variables with windows NT shell
9 9
 if "%OS%"=="Windows_NT" setlocal
10 10
 
11
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12
-set DEFAULT_JVM_OPTS=
13
-
14 11
 set DIRNAME=%~dp0
15 12
 if "%DIRNAME%" == "" set DIRNAME=.
16 13
 set APP_BASE_NAME=%~n0
17 14
 set APP_HOME=%DIRNAME%
18 15
 
16
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17
+set DEFAULT_JVM_OPTS=
18
+
19 19
 @rem Find java.exe
20 20
 if defined JAVA_HOME goto findJavaFromJavaHome
21 21
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
46 46
 goto fail
47 47
 
48 48
 :init
49
-@rem Get command-line arguments, handling Windowz variants
49
+@rem Get command-line arguments, handling Windows variants
50 50
 
51 51
 if not "%OS%" == "Windows_NT" goto win9xME_args
52 52
 if "%@eval[2+2]" == "4" goto 4NT_args

+ 2
- 0
settings.gradle View File

@@ -0,0 +1,2 @@
1
+// Leaving this empty for now, it just needs to exist...
2
+

Loading…
Cancel
Save