Tilemap updates (assets)

TheRealEmissions · Mar 19, 2024 · bf71adf · bf71adf
1 parent 497fe44
commit bf71adf
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 225 deletions.
diff --git a/assets/map/bird_common_black_animations.tsx b/assets/map/bird_common_black_animations.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="bird_common_black_animations" tilewidth="16" tileheight="16" tilecount="32" columns="4">
- <image source="animals/bird_common_black_animations.png" width="64" height="128"/>
+ <image source="../../Downloads/town full/animals/bird_common_black_animations.png" width="64" height="128"/>
 </tileset>
diff --git a/assets/map/bird_robin_animations.tsx b/assets/map/bird_robin_animations.tsx
diff --git a/assets/map/buildings.tsx b/assets/map/buildings.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="buildings" tilewidth="16" tileheight="16" tilecount="5472" columns="72">
- <image source="buildings/buildings_all.png" width="1152" height="1216"/>
+ <image source="../../Downloads/town full/buildings/buildings_all.png" width="1152" height="1216"/>
 </tileset>
diff --git a/assets/map/cosy_town_tiles.tsx b/assets/map/cosy_town_tiles.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="tiles" tilewidth="16" tileheight="16" tilecount="3015" columns="45">
- <image source="tiles/tiles.png" width="720" height="1072"/>
+ <image source="../../Downloads/town full/tiles/tiles.png" width="720" height="1072"/>
 </tileset>
diff --git a/assets/map/interior.tsx b/assets/map/interior.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="interior" tilewidth="16" tileheight="16" tilecount="9035" columns="139">
- <image source="interior/interior.png" width="2224" height="1040"/>
+ <image source="../../Downloads/town full/interior/interior.png" width="2224" height="1040"/>
 </tileset>
diff --git a/assets/map/items_inventory.tsx b/assets/map/items_inventory.tsx
diff --git a/assets/map/map.tmx b/assets/map/map.tmx
diff --git a/core/src/uk/ac/york/student/assets/skins/SkinManager.java b/core/src/uk/ac/york/student/assets/skins/SkinManager.java
@@ -4,8 +4,7 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
-import uk.ac.york.student.utils.EnumSupplierMap;
-import uk.ac.york.student.utils.SupplierMap;
+import uk.ac.york.student.utils.EnumMapOfSuppliers;
 
 import java.util.function.Supplier;
 
@@ -14,7 +13,7 @@ public class SkinManager {
     private static final Supplier<Skin> craftacular = () -> new Skin(Gdx.files.internal("skins/craftacular/skin/craftacular-ui.json"));
 
     @Getter
-    private static final EnumSupplierMap<Skins, Skin> skins = new EnumSupplierMap<>(Skins.class);
+    private static final EnumMapOfSuppliers<Skins, Skin> skins = new EnumMapOfSuppliers<>(Skins.class);
 
     static {
         skins.put(Skins.CRAFTACULAR, craftacular);

diff --git a/core/src/uk/ac/york/student/audio/sound/SoundManager.java b/core/src/uk/ac/york/student/audio/sound/SoundManager.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import uk.ac.york.student.audio.AudioManager;
 import uk.ac.york.student.audio.sound.elements.ButtonClickSound;
-import uk.ac.york.student.utils.EnumSupplierMap;
+import uk.ac.york.student.utils.EnumMapOfSuppliers;
 
 import java.util.EnumMap;
 import java.util.function.Supplier;
@@ -22,7 +22,7 @@ public class SoundManager implements AudioManager {
     @Getter
     private static final EnumMap<Sounds, GameSound> sounds = new EnumMap<>(Sounds.class);
     @Getter
-    private static final EnumSupplierMap<Sounds, GameSound> supplierSounds = new EnumSupplierMap<>(Sounds.class);
+    private static final EnumMapOfSuppliers<Sounds, GameSound> supplierSounds = new EnumMapOfSuppliers<>(Sounds.class);
     static {
         sounds.put(Sounds.BUTTON_CLICK, buttonClickSound.get());
         supplierSounds.put(Sounds.BUTTON_CLICK, buttonClickSound);

diff --git a/...c/york/student/utils/EnumSupplierMap.java → ...ork/student/utils/EnumMapOfSuppliers.java b/...c/york/student/utils/EnumSupplierMap.java → ...ork/student/utils/EnumMapOfSuppliers.java
@@ -3,8 +3,8 @@
 import java.util.EnumMap;
 import java.util.function.Supplier;
 
-public class EnumSupplierMap<T extends Enum<T>, U> extends EnumMap<T, Supplier<U>> {
-    public EnumSupplierMap(Class<T> keyType) {
+public class EnumMapOfSuppliers<T extends Enum<T>, U> extends EnumMap<T, Supplier<U>> {
+    public EnumMapOfSuppliers(Class<T> keyType) {
         super(keyType);
     }
 

diff --git a/...uk/ac/york/student/utils/SupplierMap.java → ...ac/york/student/utils/MapOfSuppliers.java b/...uk/ac/york/student/utils/SupplierMap.java → ...ac/york/student/utils/MapOfSuppliers.java
@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.function.Supplier;
 
-public class SupplierMap<T, U> extends HashMap<T, Supplier<U>> {
+public class MapOfSuppliers<T, U> extends HashMap<T, Supplier<U>> {
     public U getResult(T key) {
         Supplier<U> uSupplier = get(key);
         return uSupplier == null ? null : uSupplier.get();

diff --git a/core/src/uk/ac/york/student/utils/Wait.java b/core/src/uk/ac/york/student/utils/Wait.java
@@ -1,5 +1,6 @@
 package uk.ac.york.student.utils;
 
+import com.badlogic.gdx.Gdx;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -8,18 +9,23 @@
 import java.util.concurrent.TimeUnit;
 
 @UtilityClass
-public class Wait {
+public final class Wait {
     public static void sync(long time, @NotNull TimeUnit timeUnit) {
         try {
             timeUnit.sleep(time);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Gdx.app.error("Wait", "Interrupted", e);
         }
     }
 
     @Contract("_, _ -> new")
     public static @NotNull CompletableFuture<Void> async(long time, @NotNull TimeUnit timeUnit) {
-        return CompletableFuture.runAsync(() -> sync(time, timeUnit));
+        return CompletableFuture
+            .runAsync(() -> sync(time, timeUnit))
+            .exceptionally(e -> {
+                Gdx.app.error("Wait", "Async Exception", e);
+                return null;
+            });
     }
 
     public static void asyncBlocking(long time, TimeUnit timeUnit) {