From 3c3e3f4af23b80a846450e332a23c7f06455baa1 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Mon, 31 Dec 2018 09:56:56 -0800 Subject: [PATCH] fixes for issue #994 (wildhouse.zip not found) --- .../main/java/jme3test/asset/TestManyLocators.java | 8 ++++---- .../java/jme3test/post/TestMultiplesFilters.java | 4 +++- .../main/java/jme3test/water/TestPostWaterLake.java | 12 ++++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/jme3-examples/src/main/java/jme3test/asset/TestManyLocators.java b/jme3-examples/src/main/java/jme3test/asset/TestManyLocators.java index b7b52059d..af84da278 100644 --- a/jme3-examples/src/main/java/jme3test/asset/TestManyLocators.java +++ b/jme3-examples/src/main/java/jme3test/asset/TestManyLocators.java @@ -47,9 +47,9 @@ public class TestManyLocators { UrlLocator.class); am.registerLocator("town.zip", ZipLocator.class); - am.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", - HttpZipLocator.class); - + am.registerLocator( + "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip", + HttpZipLocator.class); am.registerLocator("/", ClasspathLocator.class); @@ -78,7 +78,7 @@ public class TestManyLocators { System.out.println("Found zip image: " + b.toString()); if (c == null) - System.out.println("Failed to load from wildhouse.zip on googlecode.com"); + System.out.println("Failed to load from wildhouse.zip on googleapis.com"); else System.out.println("Found online zip image: " + c.toString()); diff --git a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java index 46efd639a..f2aa6032e 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java @@ -79,7 +79,9 @@ public class TestMultiplesFilters extends SimpleApplication { // create the geometry and attach it // load the level from zip or http zip if (useHttp) { - assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class); + assetManager.registerLocator( + "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip", + HttpZipLocator.class); } else { assetManager.registerLocator("wildhouse.zip", ZipLocator.class); } diff --git a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java index 16441025c..d5a6df5f2 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java +++ b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java @@ -47,11 +47,13 @@ import java.io.File; public class TestPostWaterLake extends SimpleApplication { - // set default for applets - private static boolean useHttp = true; + private static boolean useHttp = false; public static void main(String[] args) { - + File file = new File("wildhouse.zip"); + if (!file.exists()) { + useHttp = true; + } TestPostWaterLake app = new TestPostWaterLake(); app.start(); } @@ -74,7 +76,9 @@ public class TestPostWaterLake extends SimpleApplication { // create the geometry and attach it // load the level from zip or http zip if (useHttp) { - assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class); + assetManager.registerLocator( + "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip", + HttpZipLocator.class); } else { assetManager.registerLocator("wildhouse.zip", ZipLocator.class); }