commit 45292c990939f7f4fa6586d0e28bcc2fd83b1f69 Author: Timo Ley Date: Thu May 27 21:48:38 2021 +0200 Init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d306be6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.gradle +.idea +build +src/test diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..931980c --- /dev/null +++ b/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'java' + id "com.github.johnrengelman.shadow" version "5.2.0" +} + +group 'ley.modding' +version '1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() + maven { + url "https://libraries.minecraft.net" + name "minecraft" + } +} + +dependencies { + implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.8.0' + compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.8.7' + compileOnly group: "net.minecraft", name: "launchwrapper", version: "1.12" + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +jar { + manifest { + attributes([ + "TweakClass": "ley.modding.tcu.UpdateTweaker", + "TweakOrder": -100000, + ]) + } +} + +build.dependsOn shadowJar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +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="-Xmx64m" + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..99873f1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'testcraftupdate' + diff --git a/src/main/java/ley/modding/tcu/FileHandler.java b/src/main/java/ley/modding/tcu/FileHandler.java new file mode 100644 index 0000000..581990a --- /dev/null +++ b/src/main/java/ley/modding/tcu/FileHandler.java @@ -0,0 +1,74 @@ +package ley.modding.tcu; + +import ley.modding.tcu.model.VersionDiff; +import net.lingala.zip4j.ZipFile; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; + +public class FileHandler { + + File gamedir; + + public FileHandler(File gamedir) { + this.gamedir = gamedir; + } + + private File getFile(String dir, String filename) { + return new File(gamedir.getAbsolutePath() + "/" + dir + "/" + filename); + } + + private void downloadFile(String dir, String filename, URL url) throws IOException { + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("GET"); + con.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11"); + BufferedInputStream in = new BufferedInputStream(con.getInputStream()); + FileOutputStream out = new FileOutputStream(getFile(dir, filename)); + byte[] dataBuffer = new byte[1024]; + int bytesRead; + while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { + out.write(dataBuffer, 0, bytesRead); + } + in.close(); + out.close(); + } + + public void processDiff(VersionDiff diff) { + + for (VersionDiff.RemoveFile rem : diff.remove) { + File f = getFile(rem.dir, rem.filename); + if (f.exists()) { + boolean del = f.delete(); + if (!del) + throw new RuntimeException("File deletion error"); + } + } + + for (VersionDiff.AddFile add : diff.add) { + try { + downloadFile(add.dir, add.filename, new URL(add.url)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + } + + public void processOverrides(URL overrides) { + try { + downloadFile(".", "temp.zip", overrides); + File tmp = getFile(".", "temp.zip"); + ZipFile zip = new ZipFile(tmp); + zip.extractAll(gamedir.getPath()); + tmp.delete(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + +} diff --git a/src/main/java/ley/modding/tcu/UpdateTweaker.java b/src/main/java/ley/modding/tcu/UpdateTweaker.java new file mode 100644 index 0000000..8c2e735 --- /dev/null +++ b/src/main/java/ley/modding/tcu/UpdateTweaker.java @@ -0,0 +1,70 @@ +package ley.modding.tcu; + +import ley.modding.tcu.model.LocalPack; +import ley.modding.tcu.model.VersionDiff; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import java.io.File; +import java.net.URL; +import java.util.List; + +public class UpdateTweaker implements ITweaker { + + private List args; + private File gameDir; + private File assetsDir; + private String profile; + private LaunchClassLoader classLoader; + + @Override + public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { + this.args = args; + this.gameDir = gameDir; + this.assetsDir = assetsDir; + this.profile = profile; + if(gameDir == null) { + this.gameDir = new File(".").getAbsoluteFile(); + } + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + this.classLoader = classLoader; + try { + File modpack = new File(gameDir.getAbsolutePath() + "/modpack.json"); + if (modpack.exists()) { + String[] ver = Util.checkVersion(modpack); + if (ver.length == 0) + return; + VersionDiff diff = Util.buildDiff(ver); + FileHandler handler = new FileHandler(gameDir); + handler.processDiff(diff); + URL overrides = Util.getOverrides(); + if (overrides != null) + handler.processOverrides(overrides); + LocalPack pack = Util.getLocal(modpack); + pack.version = ver[ver.length - 1]; + Util.writeLocal(modpack); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public String getLaunchTarget() { + return "net.minecraft.client.main.Main"; + } + + @Override + public String[] getLaunchArguments() { + return new String[0]; + } + + public void callInjectedTweaker(ITweaker tweaker) { + tweaker.acceptOptions(args, gameDir, assetsDir, profile); + tweaker.injectIntoClassLoader(classLoader); + } + +} diff --git a/src/main/java/ley/modding/tcu/Util.java b/src/main/java/ley/modding/tcu/Util.java new file mode 100644 index 0000000..90a313e --- /dev/null +++ b/src/main/java/ley/modding/tcu/Util.java @@ -0,0 +1,119 @@ +package ley.modding.tcu; + +import ley.modding.tcu.model.LocalPack; +import ley.modding.tcu.model.RemotePack; +import ley.modding.tcu.model.VersionDiff; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +public class Util { + + private static RemotePack rcache = null; + private static LocalPack lcache = null; + + public static RemotePack getRemote(LocalPack pack) throws IOException { + if (rcache != null) + return rcache; + URL url = new URL(pack.packURL); + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("GET"); + con.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11"); + int status = con.getResponseCode(); + if (status != 200) { + return null; + } + InputStreamReader r2 = new InputStreamReader(con.getInputStream()); + RemotePack ret = RemotePack.fromJSON(r2); + r2.close(); + rcache = ret; + return ret; + } + + public static LocalPack getLocal(File local) throws IOException { + if (lcache != null) + return lcache; + Reader r = new FileReader(local); + LocalPack pack = LocalPack.fromJSON(r); + r.close(); + lcache = pack; + return pack; + } + + public static void writeLocal(File local) throws IOException { + Writer w = new FileWriter(local); + lcache.toJson(w); + w.close(); + } + + public static String[] checkVersion(File local) throws IOException { + LocalPack lpack = getLocal(local); + + RemotePack rpack = getRemote(lpack); + + if (rpack != null && rpack.versions.contains(lpack.version)) { + int index = rpack.versions.indexOf(lpack.version); + int lastIndex = rpack.versions.size() - 1; + if (index == lastIndex) { + return new String[0]; + } else { + String[] ret = new String[lastIndex - index]; + int j = 0; + for (int i = index + 1; i <= lastIndex; i++) { + ret [j] = rpack.versions.get(i); + j++; + } + return ret; + } + } + return new String[0]; + } + + public static VersionDiff buildDiff(String[] versions) throws IOException { + VersionDiff diff = new VersionDiff(); + diff.add = new ArrayList<>(); + diff.remove = new ArrayList<>(); + RemotePack pack = getRemote(lcache); + + for (String ver : versions) { + VersionDiff vdiff = pack.diff.get(ver); + if (vdiff != null) { + if (vdiff.remove != null) { + for (VersionDiff.RemoveFile f : vdiff.remove) { + boolean add = true; + List toRem = new ArrayList<>(); + for (VersionDiff.AddFile a : diff.add) { + if (a.dir.equals(f.dir) && a.filename.equals(f.filename)) { + add = false; + toRem.add(a); + } + } + diff.add.removeAll(toRem); + if (add) + diff.remove.add(f); + } + } + if (vdiff.add != null) + diff.add.addAll(vdiff.add); + } + } + + return diff; + } + + public static URL getOverrides() { + if (rcache != null && rcache.overrides != null && !rcache.overrides.isEmpty()) { + try { + return new URL(rcache.overrides); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + return null; + } + +} diff --git a/src/main/java/ley/modding/tcu/model/LocalPack.java b/src/main/java/ley/modding/tcu/model/LocalPack.java new file mode 100644 index 0000000..0945a8e --- /dev/null +++ b/src/main/java/ley/modding/tcu/model/LocalPack.java @@ -0,0 +1,24 @@ +package ley.modding.tcu.model; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import java.io.Reader; +import java.io.Writer; + +public class LocalPack { + + private static Gson gson = new GsonBuilder().create(); + + public static LocalPack fromJSON(Reader reader) { + return gson.fromJson(reader, LocalPack.class); + } + + public void toJson(Writer writer) { + gson.toJson(this, writer); + } + + public String version; + public String packURL; + +} diff --git a/src/main/java/ley/modding/tcu/model/RemotePack.java b/src/main/java/ley/modding/tcu/model/RemotePack.java new file mode 100644 index 0000000..f7ef5dd --- /dev/null +++ b/src/main/java/ley/modding/tcu/model/RemotePack.java @@ -0,0 +1,22 @@ +package ley.modding.tcu.model; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import java.io.Reader; +import java.util.List; +import java.util.Map; + +public class RemotePack { + + private static Gson gson = new GsonBuilder().create(); + + public static RemotePack fromJSON(Reader reader) { + return gson.fromJson(reader, RemotePack.class); + } + + public List versions; + public String overrides; + public Map diff; + +} diff --git a/src/main/java/ley/modding/tcu/model/VersionDiff.java b/src/main/java/ley/modding/tcu/model/VersionDiff.java new file mode 100644 index 0000000..cecb604 --- /dev/null +++ b/src/main/java/ley/modding/tcu/model/VersionDiff.java @@ -0,0 +1,25 @@ +package ley.modding.tcu.model; + +import java.util.List; + +public class VersionDiff { + + public List remove; + public List add; + + public static class RemoveFile { + + public String filename; + public String dir; + + } + + public static class AddFile { + + public String url; + public String filename; + public String dir; + + } + +}