Fixes & cleanup!

Ultreon · Mar 19, 2024 · 00a5c42 · 00a5c42
1 parent 8291fc1
commit 00a5c42
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 49 deletions.
diff --git a/core/src/main/java/com/ultreon/bubbles/BubbleBlaster.java b/core/src/main/java/com/ultreon/bubbles/BubbleBlaster.java
@@ -840,32 +840,34 @@ private void onKeyPress(int keyCode, boolean holding) {
     }
 
     private void executeDevCommand(int keyCode, World world, Player player) {
-        switch (keyCode) {
-            case Keys.F1:
-                LOGGER.warn("Triggering developer command: TRIGGER_BLOOD_MOON");
-                world.getGameplayStorage().get(NAMESPACE).putBoolean(DataKeys.BLOOD_MOON_ACTIVE, true);
-                break;
-            case Keys.F3:
-                LOGGER.warn("Triggering developer command: SELF_DESTRUCT");
-                player.destroy();
-                break;
-            case Keys.F4:
-                LOGGER.warn("Triggering developer command: LEVEL_UP");
-                player.levelUp();
-                break;
-            case Keys.F5:
-                LOGGER.warn("Triggering developer command: SCORE_1000");
-                player.awardScore(1000);
-                break;
-            case Keys.F6:
-                LOGGER.warn("Triggering developer command: RESET_HP");
-                player.setHealth(player.getMaxHealth());
-                break;
-            case Keys.F7:
-                LOGGER.warn("Triggering developer command: GLITCH");
-                this.isGlitched = true;
-                break;
-        }
+        BubbleBlaster.invokeTick(() -> {
+            switch (keyCode) {
+                case Keys.F1:
+                    LOGGER.warn("Triggering developer command: TRIGGER_BLOOD_MOON");
+                    world.getGameplayStorage().get(NAMESPACE).putBoolean(DataKeys.BLOOD_MOON_ACTIVE, true);
+                    break;
+                case Keys.F3:
+                    LOGGER.warn("Triggering developer command: SELF_DESTRUCT");
+                    player.destroy();
+                    break;
+                case Keys.F4:
+                    LOGGER.warn("Triggering developer command: LEVEL_UP");
+                    player.levelUp();
+                    break;
+                case Keys.F5:
+                    LOGGER.warn("Triggering developer command: SCORE_1000");
+                    player.awardScore(1000);
+                    break;
+                case Keys.F6:
+                    LOGGER.warn("Triggering developer command: RESET_HP");
+                    player.setHealth(player.getMaxHealth());
+                    break;
+                case Keys.F7:
+                    LOGGER.warn("Triggering developer command: GLITCH");
+                    this.isGlitched = true;
+                    break;
+            }
+        });
     }
 
     private void onMouseClick(int x, int y, int button, int clicks) {

diff --git a/core/src/main/java/com/ultreon/bubbles/DevCommands.java b/core/src/main/java/com/ultreon/bubbles/DevCommands.java
diff --git a/core/src/main/java/com/ultreon/bubbles/DiscordRPC.java b/core/src/main/java/com/ultreon/bubbles/DiscordRPC.java
@@ -13,6 +13,7 @@
 
 import static com.ultreon.bubbles.BubbleBlaster.LOGGER;
 
+// TODO Replace this with Discord IPC (inter process communication) instead.
 public class DiscordRPC {
     private final Lock updateLock = new ReentrantLock(true);
     private final Thread thread;

diff --git a/core/src/main/java/com/ultreon/bubbles/render/gui/screen/SplashScreen.java b/core/src/main/java/com/ultreon/bubbles/render/gui/screen/SplashScreen.java
@@ -47,8 +47,6 @@ public void render(BubbleBlaster game, Renderer renderer, int mouseX, int mouseY
             sound.play(0.4f);
         }
 
-        renderer.hideCursor();
-
         final var timeDiff = System.currentTimeMillis() - this.startTime;
         var zoom = (float) SplashScreen.interpolate(FROM_ZOOM, TO_ZOOM, Mth.clamp(timeDiff / DURATION, 0f, 1f));
         var thumbnail = this.resizer.thumbnail(this.width * zoom, this.height * zoom);

diff --git a/core/src/main/java/com/ultreon/bubbles/resources/Emotion.java b/core/src/main/java/com/ultreon/bubbles/resources/Emotion.java
diff --git a/core/src/main/java/com/ultreon/bubbles/resources/Person.java b/core/src/main/java/com/ultreon/bubbles/resources/Person.java
diff --git a/gradle.properties b/gradle.properties
@@ -52,7 +52,7 @@ mixin_version=0.12.5+mixin.0.8.5
 fabric_version=0.14.22
 jna_version=5.13.0
 
-gdx_version=1.12.0
+gdx_version=1.12.1
 ai_version=1.8.2
 box_2d_lights_version=1.5
 robo_vm_version=2.3.16