Merge pull request #8 from RSBuddy/new-game-state-stuff

New game state stuff
RSBuddy · Feb 7, 2019 · 8ea5d0e · 8ea5d0e
2 parents d4429d5 + 3a71cf4
commit 8ea5d0e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/api/src/main/java/com/rsbuddy/osrs/event/GameStateChanged.java b/api/src/main/java/com/rsbuddy/osrs/event/GameStateChanged.java
@@ -30,21 +30,23 @@
 
 package com.rsbuddy.osrs.event;
 
+import com.rsbuddy.osrs.game.GameState;
+
 public class GameStateChanged {
 
-    private int newState;
-    private int oldState;
+    private GameState newState;
+    private GameState oldState;
 
-    public GameStateChanged(int newState, int oldState) {
+    public GameStateChanged(final GameState newState, final GameState oldState) {
         this.newState = newState;
         this.oldState = oldState;
     }
 
-    public int newState() {
+    public GameState newState() {
         return newState;
     }
 
-    public int oldState() {
+    public GameState oldState() {
         return oldState;
     }
 

diff --git a/api/src/main/java/com/rsbuddy/osrs/game/GameEvent.java b/api/src/main/java/com/rsbuddy/osrs/game/GameEvent.java
@@ -1,3 +1,33 @@
+/*
+ * Copyright (c) 2018 RSBuddy Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *    * Neither the name of RSBuddy Ltd. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 package com.rsbuddy.osrs.game;
 
 import com.rsbuddy.osrs.event.*;
@@ -31,7 +61,8 @@ public enum GameEvent {
     DRAW_LAYER(Integer.class),
     SKILL_UPDATED(SkillUpdated.class),
     WIDGET_UPDATED(Integer.class),
-    WIDGET_DRAW_END;
+    WIDGET_DRAW_END,
+    GAME_STATE_CHANGED(GameStateChanged.class);
 
     private Class<?> clazz;