diff --git a/README.md b/README.md new file mode 100644 index 00000000..ee3906fb --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ + +# Building +## Windows +Install gitbash, choco, Eclipse Temurin 17, maven, 7zip +From choco, install mingw, make +run build.sh +Build will be in ./build \ No newline at end of file diff --git a/src/main/sql/auth/createAuthTables.sql b/assets/DB/auth/createAuthTables.sql similarity index 100% rename from src/main/sql/auth/createAuthTables.sql rename to assets/DB/auth/createAuthTables.sql diff --git a/src/main/sql/auth/retrievePassHash.sql b/assets/DB/auth/retrievePassHash.sql similarity index 100% rename from src/main/sql/auth/retrievePassHash.sql rename to assets/DB/auth/retrievePassHash.sql diff --git a/src/main/sql/character/createCharacterTables.sql b/assets/DB/character/createCharacterTables.sql similarity index 100% rename from src/main/sql/character/createCharacterTables.sql rename to assets/DB/character/createCharacterTables.sql diff --git a/src/main/sql/clearTables.sql b/assets/DB/clearTables.sql similarity index 100% rename from src/main/sql/clearTables.sql rename to assets/DB/clearTables.sql diff --git a/src/main/sql/createTables.sql b/assets/DB/createTables.sql similarity index 100% rename from src/main/sql/createTables.sql rename to assets/DB/createTables.sql diff --git a/src/main/sql/structs/createStruct.sql b/assets/DB/structs/createStruct.sql similarity index 100% rename from src/main/sql/structs/createStruct.sql rename to assets/DB/structs/createStruct.sql diff --git a/src/main/sql/structs/createStructsTables.sql b/assets/DB/structs/createStructsTables.sql similarity index 100% rename from src/main/sql/structs/createStructsTables.sql rename to assets/DB/structs/createStructsTables.sql diff --git a/src/main/sql/structs/deleteStruct.sql b/assets/DB/structs/deleteStruct.sql similarity index 100% rename from src/main/sql/structs/deleteStruct.sql rename to assets/DB/structs/deleteStruct.sql diff --git a/src/main/sql/structs/getStructDataByID.sql b/assets/DB/structs/getStructDataByID.sql similarity index 100% rename from src/main/sql/structs/getStructDataByID.sql rename to assets/DB/structs/getStructDataByID.sql diff --git a/src/main/sql/structs/getStructLocalPos.sql b/assets/DB/structs/getStructLocalPos.sql similarity index 100% rename from src/main/sql/structs/getStructLocalPos.sql rename to assets/DB/structs/getStructLocalPos.sql diff --git a/src/main/sql/structs/getStructsAtWorldPos.sql b/assets/DB/structs/getStructsAtWorldPos.sql similarity index 100% rename from src/main/sql/structs/getStructsAtWorldPos.sql rename to assets/DB/structs/getStructsAtWorldPos.sql diff --git a/src/main/sql/towns/createTown.sql b/assets/DB/towns/createTown.sql similarity index 100% rename from src/main/sql/towns/createTown.sql rename to assets/DB/towns/createTown.sql diff --git a/src/main/sql/towns/createTownsTables.sql b/assets/DB/towns/createTownsTables.sql similarity index 100% rename from src/main/sql/towns/createTownsTables.sql rename to assets/DB/towns/createTownsTables.sql diff --git a/src/main/sql/towns/deleteTown.sql b/assets/DB/towns/deleteTown.sql similarity index 100% rename from src/main/sql/towns/deleteTown.sql rename to assets/DB/towns/deleteTown.sql diff --git a/src/main/sql/towns/getTownsAtWorldPos.sql b/assets/DB/towns/getTownsAtWorldPos.sql similarity index 100% rename from src/main/sql/towns/getTownsAtWorldPos.sql rename to assets/DB/towns/getTownsAtWorldPos.sql diff --git a/build.sh b/build.sh index a13852e4..54ac2f6e 100755 --- a/build.sh +++ b/build.sh @@ -1,14 +1,26 @@ #DEPENDENCIES -#Windows: JDK17, Maven, GitBash, 7zip, MinGW, GCC, Make +#Windows: JDK17, Maven, GitBash, 7zip, choco, GCC, Make #Linux: JDK17, Maven, git, bash, unzip, GCC, Make +JRE_URL="" +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + JRE_URL="" + echo "Must specify url to pull jre from!" + exit 1 +elif [[ "$OSTYPE" == "msys" ]]; then + JRE_URL="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.zip" +else + echo "Unsupported operating system!" + exit 1 +fi + #completely clear build directory rm -rf ./build #build directory structure mkdir build mkdir ./build/assets #compile project and copy into build dir -mvn package +mvn clean package cp ./target/Renderer-0.1.jar ./build/engine.jar #build launcher cd ./launcher/ @@ -17,5 +29,8 @@ make build cd .. #copy launcher, jdk, and assets into build dir mv ./launcher/launcher.exe ./build/ -unzip ./launcher/jdk.zip -d ./build/ +curl -L $JRE_URL >> jdk.zip +unzip ./jdk.zip -d ./build/ +mv ./build/jdk-* ./build/jdk +rm -f ./jdk.zip cp -r ./assets/* ./build/assets/ \ No newline at end of file diff --git a/buildNumber.properties b/buildNumber.properties index c51a7039..a97fa9f0 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Fri Aug 16 07:57:34 EDT 2024 -buildNumber=233 +#Fri Aug 16 09:31:36 EDT 2024 +buildNumber=241 diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 13f0bc95..3bba6a4b 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -19,5 +19,5 @@ + bug fixes Fix grass rendering distance - Fix audio freakout when attack while jumping/falling (should block regular attack while aerial) - Fix server ground movement tree playing animation over falling animation \ No newline at end of file + Fix server ground movement tree playing animation over falling animation + \ No newline at end of file diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 20158635..9251a696 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -587,6 +587,7 @@ Fix viewmodel animation framerate (08/16/2024) Fix server not starting Fix client disconnection causing wrong socket to be closed from server +Fix build tooling, scripts, etc # TODO diff --git a/launcher/Makefile b/launcher/Makefile index 0562b7b2..b272effd 100644 --- a/launcher/Makefile +++ b/launcher/Makefile @@ -8,4 +8,4 @@ build: ./src/main.c gcc ./src/main.c -o launcher clean: - rm ./launcher.exe \ No newline at end of file + rm -f ./launcher.exe \ No newline at end of file diff --git a/launcher/jdk.zip b/launcher/jdk.zip deleted file mode 100644 index cd9ea565..00000000 Binary files a/launcher/jdk.zip and /dev/null differ diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index 766959c7..af21ea7b 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -241,7 +241,7 @@ public class FileUtils { */ public static String getSQLScriptFileAsString(String pathName) throws IOException { String sanitizedFilePath = sanitizeFilePath(pathName); - File targetFile = new File("./src/main/sql" + sanitizedFilePath); + File targetFile = new File("./assets/DB/" + sanitizedFilePath); return Files.readString(targetFile.toPath()); }