Implement vanilla world importing.

sp-server/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

sp-server/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  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" "-Xms64m"'
+
+# 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
+    ;;
+  MSYS* | 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 or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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"
+
+exec "$JAVACMD" "$@"

sp-server/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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 Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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" "-Xms64m"
+
+@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 execute
+
+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 execute
+
+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
+
+: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 %*
+
+: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

sp-server/src/main/java/net/lax1dude/eaglercraft/sp/IntegratedServer.java

@@ -1,11 +1,19 @@
 package net.lax1dude.eaglercraft.sp;
 
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
+import net.minecraft.src.NBTBase;
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSFunctor;
 import org.teavm.jso.JSObject;
@@ -344,6 +352,74 @@ public class IntegratedServer {
 										throwExceptionToClient("Failed to import world '" + pkt.worldName + "' as EPK", t);
 										sendTaskFailed();
 									}
+								}else if(pkt.worldFormat == IPCPacket07ImportWorld.WORLD_FORMAT_MCA) {
+									try {
+										String folder = VFSSaveHandler.worldNameToFolderName(pkt.worldName);
+										VFile dir = new VFile("worlds", folder);
+										ZipInputStream folderNames = new ZipInputStream(new ByteArrayInputStream(pkt.worldData));
+										ZipEntry folderNameFile = null;
+										List<char[]> fileNames = new ArrayList<>();
+										while((folderNameFile = folderNames.getNextEntry()) != null) {
+											if (folderNameFile.getName().contains("__MACOSX/")) continue;
+											if (folderNameFile.getName().toLowerCase().endsWith(".txt")) continue;
+											if (folderNameFile.getName().toLowerCase().endsWith(".lnk")) continue;
+											if (folderNameFile.isDirectory()) continue;
+											fileNames.add(folderNameFile.getName().toCharArray());
+										}
+										final int[] i = new int[] { 0 };
+										while(fileNames.get(0).length > i[0] && fileNames.stream().allMatch(w -> w[i[0]] == fileNames.get(0)[i[0]])) i[0]++;
+										int folderPrefixOffset = i[0];
+										ZipInputStream dc = new ZipInputStream(new ByteArrayInputStream(pkt.worldData));
+										ZipEntry f = null;
+										int lastProgUpdate = 0;
+										int prog = 0;
+										byte[] bb = new byte[16000];
+										while ((f = dc.getNextEntry()) != null) {
+											if (f.getName().contains("__MACOSX/")) continue;
+											if (f.getName().toLowerCase().endsWith(".txt")) continue;
+											if (f.getName().toLowerCase().endsWith(".lnk")) continue;
+											if (f.isDirectory()) continue;
+											ByteArrayOutputStream baos = new ByteArrayOutputStream();
+											int len;
+											while ((len = dc.read(bb)) != -1) {
+												baos.write(bb, 0, len);
+											}
+											baos.close();
+											byte[] b = baos.toByteArray();
+											String fileName = f.getName().substring(folderPrefixOffset);
+											if (fileName.equals("level.dat")) {
+												NBTTagCompound worldDatNBT = CompressedStreamTools.decompress(b);
+												worldDatNBT.getCompoundTag("Data").setString("LevelName", pkt.worldName);
+												worldDatNBT.getCompoundTag("Data").setLong("LastPlayed", System.currentTimeMillis());
+												b = CompressedStreamTools.compress(worldDatNBT);
+											}
+											if (fileName.endsWith(".mcr") || fileName.endsWith(".mca")) {
+												MCAConverter.convertMCA(dir, b, fileName);
+											} else {
+												VFile ff = new VFile(dir, fileName);
+												ff.setAllBytes(b);
+											}
+											prog += b.length;
+											if (prog - lastProgUpdate > 10000) {
+												lastProgUpdate = prog;
+												updateStatusString("selectWorld.progress.importing." + pkt.worldFormat, prog);
+											}
+										}
+										String[] worldsTxt = SYS.VFS.getFile("worlds.txt").getAllLines();
+										if(worldsTxt == null || worldsTxt.length <= 0) {
+											worldsTxt = new String[] { folder };
+										}else {
+											String[] tmp = worldsTxt;
+											worldsTxt = new String[worldsTxt.length + 1];
+											System.arraycopy(tmp, 0, worldsTxt, 0, tmp.length);
+											worldsTxt[worldsTxt.length - 1] = folder;
+										}
+										SYS.VFS.getFile("worlds.txt").setAllChars(String.join("\n", worldsTxt));
+										sendIPCPacket(new IPCPacketFFProcessKeepAlive(IPCPacket07ImportWorld.ID));
+									}catch(Throwable t) {
+										throwExceptionToClient("Failed to import world '" + pkt.worldName + "' as MCA", t);
+										sendTaskFailed();
+									}
 								}else {
 									System.err.println("Client tried to import a world in an unknown format: 0x" + Integer.toHexString(pkt.worldFormat));
 									sendTaskFailed();

sp-server/src/main/java/net/lax1dude/eaglercraft/sp/MCAConverter.java

@@ -0,0 +1,61 @@
+package net.lax1dude.eaglercraft.sp;
+
+import java.io.ByteArrayInputStream;
+import java.io.OutputStream;
+import com.jcraft.jzlib.GZIPOutputStream;
+import java.util.zip.InflaterInputStream;
+
+public class MCAConverter {
+    public static void convertMCA(VFile dir, byte[] file, String fileName) {
+        VFile levelDir = new VFile(dir, "level" + (fileName.startsWith("region/") ? "0" : fileName.substring(3, fileName.indexOf('/'))));
+
+        String[] xz = fileName.substring(fileName.lastIndexOf('r') + 2, fileName.length() - 4).split("\\.");
+        int gx = Integer.parseInt(xz[0]);
+        int gz = Integer.parseInt(xz[1]);
+
+        try {
+            byte[] buffer = new byte[16000];
+            for (int x = 0; x < 32; ++x) {
+                for (int z = 0; z < 32; ++z) {
+                    int i = ((x % 32) + (z % 32) * 32) * 4;
+                    int offset = (((file[i] & 0xff) << 16) | ((file[i + 1] & 0xff) << 8) | (file[i + 2] & 0xff)) * 4096;
+                    if (offset == 0 && file[i + 3] == 0) {
+                        continue;
+                    }
+                    int chunkLen = (((file[offset] & 0xff) << 24) | ((file[offset + 1] & 0xff) << 16) | ((file[offset + 2] & 0xff) << 8) | (file[offset + 3] & 0xff));
+                    if (chunkLen == 0) continue;
+                    byte compression = file[offset + 4];
+                    byte[] data = new byte[chunkLen - 1];
+                    System.arraycopy(file, offset + 5, data, 0, chunkLen - 1);
+                    if (compression == 0) {
+                        OutputStream os = new VFile(levelDir, VFSChunkLoader.getChunkPath(gx * 32 + x, gz * 32 + z) + ".dat").getOutputStream();
+                        GZIPOutputStream gos = new GZIPOutputStream(os);
+                        ByteArrayInputStream bais = new ByteArrayInputStream(data);
+                        int len;
+                        while ((len = bais.read(buffer)) > 0) {
+                            gos.write(buffer, 0, len);
+                        }
+                        gos.close();
+                        os.close();
+                        bais.close();
+                    } else if (compression == 2) {
+                        OutputStream os = new VFile(levelDir, VFSChunkLoader.getChunkPath(gx * 32 + x, gz * 32 + z) + ".dat").getOutputStream();
+                        GZIPOutputStream gos = new GZIPOutputStream(os);
+                        InflaterInputStream iis = new InflaterInputStream(new ByteArrayInputStream(data));
+                        int len;
+                        while ((len = iis.read(buffer)) > 0) {
+                            gos.write(buffer, 0, len);
+                        }
+                        gos.close();
+                        os.close();
+                        iis.close();
+                    } else if (compression == 1) {
+                        new VFile(levelDir, VFSChunkLoader.getChunkPath(gx * 32 + x, gz * 32 + z) + ".dat").setAllBytes(data);
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+}

sp-server/src/main/java/net/lax1dude/eaglercraft/sp/VFSSaveHandler.java

@@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.sp;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 
 import net.minecraft.src.CompressedStreamTools;
 import net.minecraft.src.EntityPlayer;

src/main/java/net/lax1dude/eaglercraft/GuiNameWorldImport.java

@@ -20,7 +20,7 @@ public class GuiNameWorldImport extends GuiScreen {
 		this.parentGuiScreen = menu;
 		this.importFormat = format;
 		this.oldName = name;
-		if(name.length() > 4 && name.endsWith(".epk")) {
+		if(name.length() > 4 && (name.endsWith(".epk") || name.endsWith(".zip"))) {
 			name = name.substring(0, name.length() - 4);
 		}
 		this.name = name;

src/main/java/net/lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java

@@ -60,7 +60,8 @@ public class GuiScreenCreateWorldSelection extends GuiScreen {
 			isImportingEPK = true;
 			EaglerAdapter.openFileChooser("epk", null);
 		}else if(par1GuiButton.id == 3) {
-			this.mc.displayGuiScreen(new GuiScreenSingleplayerNotImplemented(this, "import vanilla world"));
+			isImportingMCA = true;
+			EaglerAdapter.openFileChooser("zip", null);
 		}
 	}
 	

src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java

@@ -441,7 +441,7 @@ public class EaglerAdapterImpl2 {
 			"});\r\n" + 
 			"window.eagsFileChooser.getFileChooserResult = null;\r\n" + 
 			"window.eagsFileChooser.getFileChooserResultName = null;\r\n" + 
-			"el.accept = mime;\r\n" + 
+			"el.accept = \".\" + ext;\r\n" +
 			"el.click();\r\n" + 
 			"},\r\n" + 
 			"getFileChooserResult: null,\r\n" +