Skip to content

Commit

Permalink
Update Polar and add some QOL stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
zax71 committed Jun 11, 2024
1 parent a4ef30d commit 6255751
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,27 @@ plugins {
}

group = "me.zax71"
version = "1.0.0"
version = "1.0.1"

repositories {
mavenCentral()
maven("https://jitpack.io")
}

dependencies {
// Minestom
implementation("dev.hollowcube:minestom-ce-snapshots:1_20_4-615248dc5b")
implementation("net.minestom:minestom-snapshots:1c528d8ae2")

// Polar world lib
implementation("dev.hollowcube:polar:1.6.1")
implementation("dev.hollowcube:polar:1.9.5")

// Guava https://github.com/google/guava
implementation("com.google.guava:guava:32.1.1-jre")
implementation("com.google.guava:guava:33.2.1-jre")

}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Aug 02 17:30:10 BST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# 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"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 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
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/me/zax71/polarConversionUtil/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
import net.hollowcube.polar.AnvilPolar;
import net.hollowcube.polar.PolarWorld;
import net.hollowcube.polar.PolarWriter;
import net.minestom.server.MinecraftServer;

import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.File;
import java.net.URISyntaxException;

import java.nio.file.Path;
import java.util.Arrays;
import java.util.Scanner;

public class Main {
Expand All @@ -27,14 +30,21 @@ public static Path getPath(String path) {
public static void main(String[] args) {
System.out.println("This is a utility to convert Anvil worlds to Polar:");

System.out.println("Possible world folders:");
System.out.println(" " + Arrays.toString(getSubdirectories(getPath("").toFile())));

// Using Scanner for Getting Input from User
Scanner in = new Scanner(System.in);

System.out.print("What is the name of the world you would like to convert: ");
String worldFolder = in.nextLine();

// We need to have a Minestom server running
MinecraftServer.init();

PolarWorld polarWorld;
try {
System.out.println("Trying to find " + getPath(worldFolder).resolve("region") + " and does it exist? " + getPath(worldFolder).resolve("region").toFile().exists());
System.out.println("Converting world...");
polarWorld = AnvilPolar.anvilToPolar(getPath(worldFolder));
byte[] polarWorldBytes = PolarWriter.write(polarWorld);
Expand All @@ -43,6 +53,11 @@ public static void main(String[] args) {
} catch (IOException e) {
throw new RuntimeException(e);
}
System.out.println("Finished!");
System.exit(0);
}

private static String[] getSubdirectories(File file) {
return file.list((current, name) -> new File(current, name).isDirectory());
}
}

0 comments on commit 6255751

Please sign in to comment.