fix path issue

Author: mikebarkmin

.env

@@ -9,42 +9,70 @@ function s4j_workdir() {
 }
 alias s4jwd="s4j_workdir"
 
+function s4j_cp() {
+    cp="$(s4j_workdir)/libs/*"
+    cp="$cp:$(s4j_workdir)/libs/linux-amd64/*)"
+    cp="$cp:$(s4j_workdir)/libs/windows-amd64/*)"
+    cp="$cp:."
+    echo $cp
+}
+
+alias s4jcp="sj4_cp"
+
 function s4j_build() {
   pushd $(s4jwd)
   ant -f resources/build.xml
   popd
 }
 alias s4jb="s4j_build"
 
+function s4j_compile() {
+  rm -rf $(s4j_workdir)/bin
+
+  # compile code
+  javac -cp "$(s4j_cp)" $(find . -name '*.java') -d "$(s4j_workdir)/bin"
+
+  # extract natives
+  for native_jar in $(find ./libs/*/* -name "*.jar")
+  do
+    unzip -o -q $native_jar "natives/*" -d $(s4j_workdir)/bin
+  done
+
+  # copy data
+  cp $(s4j_workdir)/data/* $(s4j_workdir)/bin
+
+  # copy other files
+  pushd $(s4j_workdir)/examples/java
+  find . ! -name '*.java' | cpio -pdm  $(s4j_workdir)/bin
+  popd
+  pushd $(s4j_workdir)/examples/reference
+  find . ! -name '*.java' | cpio -pdm  $(s4j_workdir)/bin
+  popd
+}
+alias s4jc="s4j_compile"
 
 function s4j_examples_run() {
-    java_file_path=$(find . -name "*.java" | fzf)
-    java_file=${java_file_path##*/}
-    java_dir=${java_file_path%/*}
-    pushd $java_dir;
-    java_filename="${java_file%.*}"
-    lib=$(s4j_workdir)/distribution/scratch4j-linux-amd64.jar
-    rm -rf **/*.class
-    javac -cp "$lib:." $java_file
-    echo $PWD
-    echo $java_file
-    java -cp "$lib:." $java_file
+    s4j_compile
+    pushd bin;
+    java_file_path=$(find . -name "*.class" -type f -exec grep -lr "main" {} \; | fzf)
+    java_file_path=$(echo $java_file_path | tr "/" ".")
+    java_file_path=${java_file_path:2}
+    java_file_path=${java_file_path%.class}
+    echo $java_file_path
+    java -cp $(s4j_cp) $java_file_path
     popd;
 }
 alias s4jer="s4j_examples_run"
 
 function s4j_examples_run_all() {
-    root=$(s4j_workdir)
-    for f in $(find ./examples/reference -name "*.java")
+    cp=$(s4j_cp)
+    s4j_compile
+    for f in $(find ./examples/reference -name "*.class")
     do
         java_file=${f##*/}
         java_dir=${f%/*}
         java_name="${java_file%.*}"
-        pushd $java_dir
-        rm -rf **/*.class
-        javac -cp "$root/distribution/scratch4j-linux-amd64.jar:." $java_file
-        java -cp "$root/distribution/scratch4j-linux-amd64.jar:." $java_name
-        popd
+        java -cp "$cp:bin" $java_name
     done
 }
 alias s4jera="s4j_examples_run_all"

examples/java/Cat/CatSketch.java

@@ -7,7 +7,7 @@ public class CatSketch {
 
   public CatSketch() {
     Stage myStage = new Stage(800, 600);
-    Sprite myCat = new Sprite();
+    Sprite myCat = new CatSprite();
     myStage.add(myCat);
   }
 

examples/java/StressTest/StressTest.java

@@ -10,7 +10,6 @@ public class StressTest extends Stage {
 
   public StressTest() {
     this.addBackdrop("outback", "StressTest/assets/outback.png");
-    this.setDebug(true);
 
     for (int i = 0; i < dinos; i++) {
       this.add(new Dino());

src/org/openpatch/scratch/Stage.java

@@ -24,6 +24,7 @@
 import org.openpatch.scratch.internal.Image;
 import org.openpatch.scratch.internal.Sound;
 import org.openpatch.scratch.internal.Stamp;
+import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PGraphics;
 import processing.event.KeyEvent;
@@ -955,6 +956,7 @@ public void draw() {
 
     this.run();
     this.sprites.stream().forEach(s -> s.run());
+
     this.sprites.stream().forEach(s -> s.draw());
     this.texts.stream().forEach(t -> t.draw());
 

src/org/openpatch/scratch/extensions/fs/File.java

@@ -65,7 +65,10 @@ private static String getPath(String path) {
         return path;
       }
       var systemPath = ClassLoader.getSystemResource("").toURI().getPath();
-      return Paths.get(systemPath, path).toString();
+      if (systemPath != null) {
+        return Paths.get(systemPath, path).toString();
+      }
+      return path;
     } catch (URISyntaxException e) {
       e.printStackTrace();
       return null;