fix builds

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

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/

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

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
+  Fix server ground movement tree playing animation over falling animation
+  

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

launcher/Makefile

@@ -8,4 +8,4 @@ build: ./src/main.c
 	gcc ./src/main.c -o launcher
 
 clean:
-	rm ./launcher.exe
+	rm -f ./launcher.exe

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());
     }