Merge pull request #3 from umjammer/0.0.4

0.0.4
umjammer · Apr 6, 2024 · a1761e5 · a1761e5
2 parents bc47495 + 6f85209
commit a1761e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-apps-hub</artifactId>
-  <version>0.0.3</version>
+  <version>0.0.4</version>
 
   <properties>
     <javapackager.name>Hub</javapackager.name>
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>com.github.umjammer</groupId> <!-- vavi / com.github.umjammer -->
       <artifactId>vavi-awt-joystick</artifactId>
-      <version>0.0.10</version>
+      <version>0.0.11</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/vavi/apps/hub/Gamepad.java b/src/main/java/vavi/apps/hub/Gamepad.java
@@ -28,6 +28,7 @@ public class Gamepad implements Plugin {
 
     static {
         System.setProperty("net.java.games.input.InputEvent.fillAll", "true");
+        System.setProperty("net.java.games.input.ControllerEnvironment.excludes", "net.java.games.input");
 
         System.setProperty("vavi.games.input.listener.period", "100");
         System.setProperty("vavi.games.input.listener.warmup", "500");

diff --git a/src/main/java/vavi/games/input/listener/MuseScoreListener.java b/src/main/java/vavi/games/input/listener/MuseScoreListener.java
@@ -6,6 +6,8 @@
 
 package vavi.games.input.listener;
 
+import java.util.Objects;
+
 import net.java.games.input.Event;
 import vavi.games.input.listener.GamepadInputEventListener.AppInfo;
 import vavi.games.input.listener.GamepadInputEventListener.Context;
@@ -34,7 +36,7 @@ public class MuseScoreListener extends GamepadAdapter {
 
     @Override
     public boolean match(AppInfo a) {
-        return a.id().equals(bundleId);
+        return Objects.requireNonNullElse(a.id(), false).equals(bundleId);
     }
 
     private Context context;