From 2062a79a2a5bbd1298d78668bb0131036b3bd455 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 25 May 2020 13:52:18 -0700 Subject: [PATCH] Gitignore and should be buildable --- .gitignore | 11 +- build/build.gradle => build.gradle | 2 +- build/build.properties => build.properties | 0 .../wrapper/gradle-wrapper.jar | Bin 55627 -> 55627 bytes .../wrapper/gradle-wrapper.properties | 0 build/gradlew => gradlew | 0 build/gradlew.bat => gradlew.bat | 168 +++++++++--------- build/settings.gradle => settings.gradle | 0 8 files changed, 89 insertions(+), 92 deletions(-) rename build/build.gradle => build.gradle (98%) rename build/build.properties => build.properties (100%) rename {build/gradle => gradle}/wrapper/gradle-wrapper.jar (89%) rename {build/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename build/gradlew => gradlew (100%) rename build/gradlew.bat => gradlew.bat (96%) rename build/settings.gradle => settings.gradle (100%) diff --git a/.gitignore b/.gitignore index 227ec997..f2a9a45d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,11 @@ -.gradle/ -build/ +./build/ NotEnoughItems.iml NotEnoughItems.ipr NotEnoughItems.iws -*.bat -======= -build/build/* -build/run/* -build/.gradle/* *.ipr *.iml *.iws .idea/** +run/* +.gradle/ + diff --git a/build/build.gradle b/build.gradle similarity index 98% rename from build/build.gradle rename to build.gradle index 86e493e5..3e69005a 100644 --- a/build/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ minecraft { version = config.mc_version + "-" + config.forge_version } -def root = project.projectDir.parentFile +def root = project.projectDir; sourceSets { main { java { diff --git a/build/build.properties b/build.properties similarity index 100% rename from build/build.properties rename to build.properties diff --git a/build/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 89% rename from build/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar index 952230c58788e11fd493ce3adcd5def131ffb9ac..d9b7505b1096bc428abaa017cb79c9d2da247111 100644 GIT binary patch delta 1140 zcmXw%YegBOZkpL6=~^87gGfBxq@=Y6c>V(YkAUYIAA zgb)%;$h`5&z8<+s!p^i4a1Ir~xm>|cTE@i!oZ-{}1Du8d@8m9vfGQ-T5+IqhmkVDr zC^$kIM1*K)mO;teLbgMyxIV-y3KUXuLK0XiSr#1#=GhVRto)Yq?Wj>q$X6*L z>4Ii6mDytW^O0p@=<^}!C-$~0O0joh>?p?G$5jM@Zdc+e#&#xgSi4&*L(1Q_%z-XP zwH@5K&GzA4PdT~MSsur6GB|Vr=na<6n*Rt zql0xO(3R9TiI^_3N2eYXR(VQENIcUW^T_$d#xXe)(xKKLP;s+Oj9a+F*%wN^-4kHeeN~HQFRvTdLo9q`2v_sm z6pUoKUlPRpF16dgzmX7fR`{b^S*yK|79?!vBN@Y?W5Uk&1kuzQ1#O>+;ai?QK?CiJ z2`OA;?wt-mY0dw-&660hO%_8$Wi13~ zweAP7TT!gH9fHUWTRi}0Zvi-MZvgmg$5ieVMjlQbhE$B>2tbDeeZDwQlkcpAl*!oy zpqR!nn*YP==@Lk7aMc1_bR7lw=E?v_a+d;hx^WwRcNIhoo;-jq4_-| zFbb4JWtR9_LH7&P<~BEXwfayADOON~AG}cX`kd2;m*>Yh|MNfRIqzc~7hA{0@`7Bk zB!rM)Lf))zG4{w+5_YDYgmWk#&gF7;(o!xK;0&h*7~nJvcqeyR1XL~=l>o`4y(Ke4x6QG&e_V@EOeKCV0nbh{H*F}5p-!`eMs8B*T%We#-v zbxR`o+T8V7r^c@eGq(lMtfUm$p$nwR&M>}Le;a*v8VZoQ()D6CY)x68Cn|!F6B@XX zivOLN5CO)U3Z=n7nnQ8eHowA&ZR0B)KyAsuS{0Tnme#JH6^?JuELeP0>B zB)o>F(S&SWtK~Z{DAqCCmD%XI5ux=*;oHn?lYODo+dTnh-B+||_Trjx1H{5dhHy2{ zOuHk{ zpOC^u=HBT5l;%u;D)W8-lNp{Z{bSZbB-N4z&|onD+_m77mQ2<{q-hc(w#g!hsH_D5 zt=0nob}NeYw!;v)ZmR>}?9Biz_IiNNc1-0=VdTNo5lF>2jskQz(C3Q-HF?eoNSU0C z0E%fGqv=1qnl6UaMpq5MMb|NaZ>|i0BzFlwryIB7cUMBh;K>E(^5B){Jvc_T7pn%m o2SKyy%>&5wA@uojAhO`Yh3oxzom+k!^_Ra4G{zY;9G>a_2Y{`oSpWb4 diff --git a/build/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from build/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/build/gradlew b/gradlew similarity index 100% rename from build/gradlew rename to gradlew diff --git a/build/gradlew.bat b/gradlew.bat similarity index 96% rename from build/gradlew.bat rename to gradlew.bat index e95643d6..f9553162 100644 --- a/build/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/build/settings.gradle b/settings.gradle similarity index 100% rename from build/settings.gradle rename to settings.gradle