fix: old android doesn't support java 11 features, so i made some retarded changes

4 files changed, 33 insertions, 26 deletions

diff --git a/core/src/kz/ilotterytea/maxon/pets/PetManager.java b/core/src/kz/ilotterytea/maxon/pets/PetManager.java
index f5f7aed..650e8c5 100644
--- a/core/src/kz/ilotterytea/maxon/pets/PetManager.java
+++ b/core/src/kz/ilotterytea/maxon/pets/PetManager.java
@@ -47,13 +47,13 @@ public class PetManager {
         logger.info("Loaded {} pets", pets.size());
     }
 
-    public Optional<Pet> getPet(String id) {
+    public Pet getPet(String id) {
         for (Pet pet : pets) {
             if (pet.getId().equals(id)) {
-                return Optional.of(pet);
+                return pet;
             }
         }
-        return Optional.empty();
+        return null;
     }
 
 
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
index 40e7e8e..224c236 100644
--- a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
@@ -49,7 +49,6 @@ import net.mgsx.gltf.scene3d.utils.IBLBuilder;
 
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.Optional;
 
 public class GameScreen implements Screen, InputProcessor {
     final MaxonGame game;
@@ -139,15 +138,15 @@ public class GameScreen implements Screen, InputProcessor {
                 double multiplier = 0.0f;
 
                 for (String id : savegame.getPurchasedPets().keySet()) {
-                    Optional<Pet> pet = game.getPetManager().getPet(id);
+                    Pet pet = game.getPetManager().getPet(id);
 
-                    if (pet.isEmpty()) {
+                    if (pet == null) {
                         continue;
                     }
 
                     int amount = savegame.getPurchasedPets().get(id);
 
-                    double m = pet.get().getMultiplier() * amount;
+                    double m = pet.getMultiplier() * amount;
                     multiplier += m;
                 }
 
@@ -205,16 +204,16 @@ public class GameScreen implements Screen, InputProcessor {
         // Getting the pet decals
         for (String id : savegame.getPurchasedPets().keySet()) {
             PetManager petManager = game.getPetManager();
-            Optional<Pet> pet = petManager.getPet(id);
+            Pet pet = petManager.getPet(id);
 
-            if (pet.isEmpty()) {
+            if (pet == null) {
                 continue;
             }
 
             int amount = savegame.getPurchasedPets().get(id);
 
             for (int i = 0; i < amount; i++) {
-                Decal decal = pet.get().getDecal();
+                Decal decal = pet.getDecal();
                 petDecals.add(Decal.newDecal(decal.getWidth(), decal.getHeight(), decal.getTextureRegion()));
             }
         }
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/Giftbox.java b/core/src/kz/ilotterytea/maxon/screens/game/Giftbox.java
index 31ae982..83ce8ab 100644
--- a/core/src/kz/ilotterytea/maxon/screens/game/Giftbox.java
+++ b/core/src/kz/ilotterytea/maxon/screens/game/Giftbox.java
@@ -82,7 +82,7 @@ public class Giftbox implements Disposable {
             @Override
             public void clicked(InputEvent event, float x, float y) {
                 super.clicked(event, x, y);
-                Triple<Integer, Double, Optional<String>> gift = giveGift();
+                Triple<Integer, Double, String> gift = giveGift();
                 displayGift(gift.getFirst(), gift.getSecond(), gift.getThird());
                 updateBox(false);
             }
@@ -126,7 +126,7 @@ public class Giftbox implements Disposable {
 
     public void update(float delta, Camera camera) {
         if (OsUtils.isPC && checkCollision(camera)) {
-            Triple<Integer, Double, Optional<String>> gift = giveGift();
+            Triple<Integer, Double, String> gift = giveGift();
             displayGift(gift.getFirst(), gift.getSecond(), gift.getThird());
             updateBox(false);
         } else if (OsUtils.isMobile && isActive) {
@@ -222,12 +222,12 @@ public class Giftbox implements Disposable {
         Timer.schedule(task, delaySeconds);
     }
 
-    private Triple<Integer, Double, Optional<String>> giveGift() {
+    private Triple<Integer, Double, String> giveGift() {
         Savegame savegame = Savegame.getInstance();
 
         int choice = Math.getRandomNumber(1, 3);
         double value;
-        Optional<String> petName = Optional.empty();
+        String petName = null;
 
         switch (choice) {
             // Pet
@@ -240,9 +240,9 @@ public class Giftbox implements Disposable {
                     Map.Entry<String, Integer> pet = list.get(0);
 
                     PetManager petManager = MaxonGame.getInstance().getPetManager();
-                    Optional<Pet> petData = petManager.getPet(pet.getKey());
+                    Pet petData = petManager.getPet(pet.getKey());
 
-                    if (petData.isEmpty()) {
+                    if (petData == null) {
                         value = 0.0;
                         break;
                     }
@@ -250,8 +250,8 @@ public class Giftbox implements Disposable {
                     value = 1.0;
 
                     pets.put(pet.getKey(), pet.getValue() + (int) value);
-                    savegame.increaseMultiplier(petData.get().getMultiplier());
-                    petName = Optional.of(pet.getKey());
+                    savegame.increaseMultiplier(petData.getMultiplier());
+                    petName = pet.getKey();
                 } catch (Exception e) {
                     value = 0.0;
                 }
@@ -276,7 +276,7 @@ public class Giftbox implements Disposable {
         return new Triple<>(choice, value, petName);
     }
 
-    private void displayGift(int choice, double value, Optional<String> petName) {
+    private void displayGift(int choice, double value, String petName) {
         Table mainTable = new Table(skin);
         mainTable.setBackground("halftransparentblack");
         mainTable.setFillParent(true);
@@ -309,7 +309,7 @@ public class Giftbox implements Disposable {
 
         switch (choice) {
             case 1:
-                regionName = petName.orElse("pets");
+                regionName = petName != null ? petName : "pets";
                 break;
             case 2:
                 regionName = "multiplier";
@@ -322,11 +322,11 @@ public class Giftbox implements Disposable {
         // Adding the icon
         TextureRegion region;
 
-        if (petName.isPresent() && choice == 1) {
+        if (petName != null && choice == 1) {
             PetManager petManager = MaxonGame.getInstance().getPetManager();
-            Optional<Pet> petData = petManager.getPet(regionName);
+            Pet petData = petManager.getPet(regionName);
 
-            region = petData.get().getIcon().getFrame(0);
+            region = petData.getIcon().getFrame(0);
         } else {
             TextureAtlas atlas = assetManager.get("sprites/gui/player_icons.atlas", TextureAtlas.class);
             region = atlas.findRegion(regionName);
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java b/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java
index f7dd967..fb0ebfd 100644
--- a/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java
+++ b/core/src/kz/ilotterytea/maxon/screens/game/shop/ShopUI.java
@@ -257,12 +257,17 @@ public class ShopUI {
                     }
 
                     if (mode == ShopMode.BUY) {
+                        Integer amount = savegame.getPurchasedPets().get(pet.getId());
+
+                        if (amount == null) {
+                            amount = 0;
+                        }
+
                         savegame.decreaseMoney(widget.getPrice());
                         savegame.increaseMultiplier(pet.getMultiplier() * multiplier.getMultiplier());
                         savegame.getPurchasedPets().put(
                                 pet.getId(),
-                                savegame.getPurchasedPets().getOrDefault(pet.getId(), 0)
-                                        + multiplier.getMultiplier()
+                                amount + multiplier.getMultiplier()
                         );
                         purchaseSound.play();
                     } else {
@@ -323,7 +328,10 @@ public class ShopUI {
                 continue;
             }
 
-            int amount = savegame.getPurchasedPets().getOrDefault(widget.getPet().getId(), 0);
+            Integer amount = savegame.getPurchasedPets().get(widget.getPet().getId());
+
+            if (amount == null) amount = 0;
+
             double price = widget.getPet().getPrice() * java.lang.Math.pow(1.15f, amount + multiplier.getMultiplier());
 
             if (mode == ShopMode.SELL) {