diff --git a/.gitignore b/.gitignore index a89fc0c3f..d3eea756c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,17 @@ *.class -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* .gradle .nb-gradle -*.bat *.log .mine* *.json *.hmd -HMCLAPI/build/ -HMCL/build/ -HMCLServer/ -HMCSM/build/ -MetroLookAndFeel/build/ -/HMCUtils/build/ +/HMCL/build/ /HMCLaF/build/ -/HMCLUtils/build/ +/HMCLAPI/build/ /HMCLCore/build/ \ No newline at end of file diff --git a/HMCL/proguard.pro b/HMCL/proguard.pro deleted file mode 100755 index d85b60f74..000000000 --- a/HMCL/proguard.pro +++ /dev/null @@ -1,81 +0,0 @@ --libraryjars /lib/rt.jar --libraryjars /lib/jce.jar --libraryjars /lib/jsse.jar - --dontoptimize --dontshrink --dontwarn java.lang.invoke.* - --overloadaggressively --repackageclasses 'org.jackhuang.hellominecraft.launcher' --allowaccessmodification - --renamesourcefileattribute SourceFile - --keepattributes *Annotation*,SourceFile,LineNumberTable,Signature - --keep class com.** { *; } --keep class org.jackhuang.hellominecraft.lookandfeel.* { *; } --keep class org.jackhuang.hellominecraft.lookandfeel.painters.* { *; } --keep class org.jackhuang.hellominecraft.lookandfeel.ui.* { *; } - --keepclassmembers class org.jackhuang.mojang.authlib.Agent { *; } --keepclassmembers class org.jackhuang.mojang.authlib.UserType { *; } - --keepclassmembers class org.jackhuang.mojang.authlib.properties.Property { *; } - --keepclassmembers class org.jackhuang.mojang.authlib.minecraft.MinecraftProfileTexture$Type { *; } --keepclassmembers class org.jackhuang.mojang.authlib.minecraft.MinecraftProfileTexture { *; } - --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.request.AuthenticationRequest { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.request.InvalidateRequest { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.request.JoinMinecraftServerRequest { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.request.RefreshRequest { *; } - --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.AuthenticationResponse { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.HasJoinedMinecraftServerResponse { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.ProfileSearchResultsResponse { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.RefreshResponse { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.Response { *; } --keepclassmembers class org.jackhuang.mojang.authlib.yggdrasil.response.User { *; } - --keep class org.jackhuang.hellominecraft.launcher.Main { public static void main(java.lang.String[]); } --keep class org.jackhuang.hellominecraft.launcher.Launcher { public static void main(java.lang.String[]); } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Profile { private ; public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.settings.Config { private ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftLibrary { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.IMinecraftLibrary { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Natives { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.OS { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.Rules { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.version.MinecraftVersion { public ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsObject { ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.assets.AssetsIndex { ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.ModInfo { ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.InstallProfile { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.Install { public ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.vanilla.MinecraftForgeVersionRoot { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.vanilla.MinecraftForgeVersion { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.bmcl.ForgeVersion { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.forge.bmcl.Downloads { public ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.optifine.OptiFineVersion { public ; } - --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsRoot { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderMCVersions { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public ; } --keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public ; } - --keepclassmembers class org.jackhuang.hellominecraft.utils.system.JdkVersion { private ; } - --keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public ; } --keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public ; } --keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersions { public ; } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..30d399d8d Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..d7fb3c76c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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=-Dhttp.proxyHost=127.0.0.1 -Dhttp.proxyPort=1080 -Dhttps.proxyHost=127.0.0.1 -Dhttps.proxyPort=1080 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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