Release 0.1 pre-alpha time!

row454 · Jan 22, 2020 · 69a3c5e · 69a3c5e
1 parent 47d7846
commit 69a3c5e
Show file tree

Hide file tree

Showing 157 changed files with 33 additions and 84 deletions.
diff --git a/game/noahgame/assets/_DS_Store → game/assets/_DS_Store b/game/noahgame/assets/_DS_Store → game/assets/_DS_Store
diff --git a/.../assets/fonts/PolygonPixel5x7Standard.ttf → .../assets/fonts/PolygonPixel5x7Standard.ttf b/.../assets/fonts/PolygonPixel5x7Standard.ttf → .../assets/fonts/PolygonPixel5x7Standard.ttf
diff --git a/game/noahgame/assets/sounds/_DS_Store → game/assets/sounds/_DS_Store b/game/noahgame/assets/sounds/_DS_Store → game/assets/sounds/_DS_Store
diff --git a/game/noahgame/assets/sounds/music/blank8.wav → game/assets/sounds/music/blank8.wav b/game/noahgame/assets/sounds/music/blank8.wav → game/assets/sounds/music/blank8.wav
diff --git a/...assets/sounds/music/building_together.wav → ...assets/sounds/music/building_together.wav b/...assets/sounds/music/building_together.wav → ...assets/sounds/music/building_together.wav
diff --git a/...noahgame/assets/sounds/music/surprise.wav → game/assets/sounds/music/surprise.wav b/...noahgame/assets/sounds/music/surprise.wav → game/assets/sounds/music/surprise.wav
diff --git a/game/noahgame/assets/sounds/sfx/_DS_Store → game/assets/sounds/sfx/_DS_Store b/game/noahgame/assets/sounds/sfx/_DS_Store → game/assets/sounds/sfx/_DS_Store
diff --git a/game/noahgame/assets/sounds/sfx/beep.wav → game/assets/sounds/sfx/beep.wav b/game/noahgame/assets/sounds/sfx/beep.wav → game/assets/sounds/sfx/beep.wav
diff --git a/game/noahgame/assets/textures/New Piskel.png → game/assets/textures/New Piskel.png b/game/noahgame/assets/textures/New Piskel.png → game/assets/textures/New Piskel.png
diff --git a/game/noahgame/assets/textures/_DS_Store → game/assets/textures/_DS_Store b/game/noahgame/assets/textures/_DS_Store → game/assets/textures/_DS_Store
diff --git a/game/noahgame/assets/textures/d10.png → game/assets/textures/d10.png b/game/noahgame/assets/textures/d10.png → game/assets/textures/d10.png
diff --git a/game/noahgame/assets/textures/d2.png → game/assets/textures/d2.png b/game/noahgame/assets/textures/d2.png → game/assets/textures/d2.png
diff --git a/game/noahgame/assets/textures/d4.png → game/assets/textures/d4.png b/game/noahgame/assets/textures/d4.png → game/assets/textures/d4.png
diff --git a/game/noahgame/assets/textures/d6.png → game/assets/textures/d6.png b/game/noahgame/assets/textures/d6.png → game/assets/textures/d6.png
diff --git a/game/noahgame/assets/textures/d8.png → game/assets/textures/d8.png b/game/noahgame/assets/textures/d8.png → game/assets/textures/d8.png
diff --git a/...game/assets/textures/inventory_screen.png → game/assets/textures/inventory_screen.png b/...game/assets/textures/inventory_screen.png → game/assets/textures/inventory_screen.png
diff --git a/...oahgame/assets/textures/sheet_buttons.png → game/assets/textures/sheet_buttons.png b/...oahgame/assets/textures/sheet_buttons.png → game/assets/textures/sheet_buttons.png
diff --git a/...ahgame/assets/textures/sheet_entities.png → game/assets/textures/sheet_entities.png b/...ahgame/assets/textures/sheet_entities.png → game/assets/textures/sheet_entities.png
diff --git a/.../noahgame/assets/textures/sheet_items.png → game/assets/textures/sheet_items.png b/.../noahgame/assets/textures/sheet_items.png → game/assets/textures/sheet_items.png
diff --git a/...assets/textures/sheet_static_entities.png → ...assets/textures/sheet_static_entities.png b/...assets/textures/sheet_static_entities.png → ...assets/textures/sheet_static_entities.png
diff --git a/.../noahgame/assets/textures/sheet_tiles.png → game/assets/textures/sheet_tiles.png b/.../noahgame/assets/textures/sheet_tiles.png → game/assets/textures/sheet_tiles.png
diff --git a/game/noahgame/bin/worlds/world1.rm → game/assets/worlds/world1.rm b/game/noahgame/bin/worlds/world1.rm → game/assets/worlds/world1.rm
diff --git a/game/bin/.gitignore b/game/bin/.gitignore
@@ -0,0 +1 @@
+/com/
diff --git a/game/noahgame/bin/_DS_Store → game/bin/_DS_Store b/game/noahgame/bin/_DS_Store → game/bin/_DS_Store
diff --git a/...ame/bin/fonts/PolygonPixel5x7Standard.ttf → game/bin/fonts/PolygonPixel5x7Standard.ttf b/...ame/bin/fonts/PolygonPixel5x7Standard.ttf → game/bin/fonts/PolygonPixel5x7Standard.ttf
diff --git a/game/noahgame/bin/sounds/_DS_Store → game/bin/sounds/_DS_Store b/game/noahgame/bin/sounds/_DS_Store → game/bin/sounds/_DS_Store
diff --git a/game/noahgame/bin/sounds/music/blank8.wav → game/bin/sounds/music/blank8.wav b/game/noahgame/bin/sounds/music/blank8.wav → game/bin/sounds/music/blank8.wav
diff --git a/...me/bin/sounds/music/building_together.wav → game/bin/sounds/music/building_together.wav b/...me/bin/sounds/music/building_together.wav → game/bin/sounds/music/building_together.wav
diff --git a/game/noahgame/bin/sounds/music/surprise.wav → game/bin/sounds/music/surprise.wav b/game/noahgame/bin/sounds/music/surprise.wav → game/bin/sounds/music/surprise.wav
diff --git a/game/noahgame/bin/sounds/sfx/_DS_Store → game/bin/sounds/sfx/_DS_Store b/game/noahgame/bin/sounds/sfx/_DS_Store → game/bin/sounds/sfx/_DS_Store
diff --git a/game/noahgame/bin/sounds/sfx/beep.wav → game/bin/sounds/sfx/beep.wav b/game/noahgame/bin/sounds/sfx/beep.wav → game/bin/sounds/sfx/beep.wav
diff --git a/game/noahgame/bin/textures/New Piskel.png → game/bin/textures/New Piskel.png b/game/noahgame/bin/textures/New Piskel.png → game/bin/textures/New Piskel.png
diff --git a/game/noahgame/bin/textures/_DS_Store → game/bin/textures/_DS_Store b/game/noahgame/bin/textures/_DS_Store → game/bin/textures/_DS_Store
diff --git a/game/noahgame/bin/textures/d10.png → game/bin/textures/d10.png b/game/noahgame/bin/textures/d10.png → game/bin/textures/d10.png
diff --git a/game/noahgame/bin/textures/d2.png → game/bin/textures/d2.png b/game/noahgame/bin/textures/d2.png → game/bin/textures/d2.png
diff --git a/game/noahgame/bin/textures/d4.png → game/bin/textures/d4.png b/game/noahgame/bin/textures/d4.png → game/bin/textures/d4.png
diff --git a/game/noahgame/bin/textures/d6.png → game/bin/textures/d6.png b/game/noahgame/bin/textures/d6.png → game/bin/textures/d6.png
diff --git a/game/noahgame/bin/textures/d8.png → game/bin/textures/d8.png b/game/noahgame/bin/textures/d8.png → game/bin/textures/d8.png
diff --git a/...oahgame/bin/textures/inventory_screen.png → game/bin/textures/inventory_screen.png b/...oahgame/bin/textures/inventory_screen.png → game/bin/textures/inventory_screen.png
diff --git a/game/noahgame/bin/textures/sheet_buttons.png → game/bin/textures/sheet_buttons.png b/game/noahgame/bin/textures/sheet_buttons.png → game/bin/textures/sheet_buttons.png
diff --git a/.../noahgame/bin/textures/sheet_entities.png → game/bin/textures/sheet_entities.png b/.../noahgame/bin/textures/sheet_entities.png → game/bin/textures/sheet_entities.png
diff --git a/game/noahgame/bin/textures/sheet_items.png → game/bin/textures/sheet_items.png b/game/noahgame/bin/textures/sheet_items.png → game/bin/textures/sheet_items.png
diff --git a/...me/bin/textures/sheet_static_entities.png → game/bin/textures/sheet_static_entities.png b/...me/bin/textures/sheet_static_entities.png → game/bin/textures/sheet_static_entities.png
diff --git a/game/noahgame/bin/textures/sheet_tiles.png → game/bin/textures/sheet_tiles.png b/game/noahgame/bin/textures/sheet_tiles.png → game/bin/textures/sheet_tiles.png
diff --git a/game/noahgame/assets/worlds/world1.rm → game/bin/worlds/world1.rm b/game/noahgame/assets/worlds/world1.rm → game/bin/worlds/world1.rm
@@ -1,12 +1,12 @@
-21 10
-11 5
-3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 7 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
-6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5
+21 10
+11 5
+3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 7 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2
+6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5
diff --git a/game/noahgame/.classpath b/game/noahgame/.classpath
diff --git a/game/noahgame/.project b/game/noahgame/.project
diff --git a/game/noahgame/.settings/org.eclipse.jdt.core.prefs b/game/noahgame/.settings/org.eclipse.jdt.core.prefs
diff --git a/game/noahgame/bin/com/pixelandbitgames/display/Display.class b/game/noahgame/bin/com/pixelandbitgames/display/Display.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/Entity.class b/game/noahgame/bin/com/pixelandbitgames/entities/Entity.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/EntityManager$1.class b/game/noahgame/bin/com/pixelandbitgames/entities/EntityManager$1.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/EntityManager.class b/game/noahgame/bin/com/pixelandbitgames/entities/EntityManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/creature/Creature.class b/game/noahgame/bin/com/pixelandbitgames/entities/creature/Creature.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/creature/Player.class b/game/noahgame/bin/com/pixelandbitgames/entities/creature/Player.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/creature/Zombie.class b/game/noahgame/bin/com/pixelandbitgames/entities/creature/Zombie.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Die.class b/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Die.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Projectile.class b/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Projectile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Snowball.class b/game/noahgame/bin/com/pixelandbitgames/entities/projectiles/Snowball.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/statics/Bush.class b/game/noahgame/bin/com/pixelandbitgames/entities/statics/Bush.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/entities/statics/StaticEntity.class b/game/noahgame/bin/com/pixelandbitgames/entities/statics/StaticEntity.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/game/Game.class b/game/noahgame/bin/com/pixelandbitgames/game/Game.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/game/Handler.class b/game/noahgame/bin/com/pixelandbitgames/game/Handler.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/game/Launcher.class b/game/noahgame/bin/com/pixelandbitgames/game/Launcher.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/Assets.class b/game/noahgame/bin/com/pixelandbitgames/gfx/Assets.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/Camera.class b/game/noahgame/bin/com/pixelandbitgames/gfx/Camera.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/FontLoader.class b/game/noahgame/bin/com/pixelandbitgames/gfx/FontLoader.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/ImageLoader.class b/game/noahgame/bin/com/pixelandbitgames/gfx/ImageLoader.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/PreLoaderImage.class b/game/noahgame/bin/com/pixelandbitgames/gfx/PreLoaderImage.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/SpriteSheet.class b/game/noahgame/bin/com/pixelandbitgames/gfx/SpriteSheet.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/gfx/Text.class b/game/noahgame/bin/com/pixelandbitgames/gfx/Text.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/input/KeyManager.class b/game/noahgame/bin/com/pixelandbitgames/input/KeyManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/input/MouseManager.class b/game/noahgame/bin/com/pixelandbitgames/input/MouseManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/inventory/Inventory.class b/game/noahgame/bin/com/pixelandbitgames/inventory/Inventory.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/items/ISkillTree.class b/game/noahgame/bin/com/pixelandbitgames/items/ISkillTree.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/items/Item.class b/game/noahgame/bin/com/pixelandbitgames/items/Item.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/items/ItemManager.class b/game/noahgame/bin/com/pixelandbitgames/items/ItemManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/rooms/Room.class b/game/noahgame/bin/com/pixelandbitgames/rooms/Room.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/GameState.class b/game/noahgame/bin/com/pixelandbitgames/states/GameState.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/MainMenuState$1.class b/game/noahgame/bin/com/pixelandbitgames/states/MainMenuState$1.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/MainMenuState.class b/game/noahgame/bin/com/pixelandbitgames/states/MainMenuState.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/MenuState.class b/game/noahgame/bin/com/pixelandbitgames/states/MenuState.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/State.class b/game/noahgame/bin/com/pixelandbitgames/states/State.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/states/StateManager.class b/game/noahgame/bin/com/pixelandbitgames/states/StateManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/BottomLeftCornerWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/BottomLeftCornerWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/BottomRightCornerWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/BottomRightCornerWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/FloorTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/FloorTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/HorizontalWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/HorizontalWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/Tile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/Tile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/TopLeftCornerWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/TopLeftCornerWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/TopRightCornerWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/TopRightCornerWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/VerticalWallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/VerticalWallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/tiles/WallTile.class b/game/noahgame/bin/com/pixelandbitgames/tiles/WallTile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/ui/ClickListener.class b/game/noahgame/bin/com/pixelandbitgames/ui/ClickListener.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/ui/UIImageButton.class b/game/noahgame/bin/com/pixelandbitgames/ui/UIImageButton.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/ui/UIManager.class b/game/noahgame/bin/com/pixelandbitgames/ui/UIManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/ui/UIObject.class b/game/noahgame/bin/com/pixelandbitgames/ui/UIObject.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/MusicManager.class b/game/noahgame/bin/com/pixelandbitgames/util/MusicManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/Utils.class b/game/noahgame/bin/com/pixelandbitgames/util/Utils.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/audio/AudioFile.class b/game/noahgame/bin/com/pixelandbitgames/util/audio/AudioFile.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/audio/MusicManager.class b/game/noahgame/bin/com/pixelandbitgames/util/audio/MusicManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/audio/SoundEffectManager.class b/game/noahgame/bin/com/pixelandbitgames/util/audio/SoundEffectManager.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/collisions/QuadTree.class b/game/noahgame/bin/com/pixelandbitgames/util/collisions/QuadTree.class
diff --git a/game/noahgame/bin/com/pixelandbitgames/util/collisions/Sizeable.class b/game/noahgame/bin/com/pixelandbitgames/util/collisions/Sizeable.class
diff --git a/game/noahgame/src/com/kiemax/util/MusicManager.java b/game/noahgame/src/com/kiemax/util/MusicManager.java
diff --git a/...hgame/src/com/kiemax/display/Display.java → game/src/com/kiemax/display/Display.java b/...hgame/src/com/kiemax/display/Display.java → game/src/com/kiemax/display/Display.java
diff --git a/...hgame/src/com/kiemax/entities/Entity.java → game/src/com/kiemax/entities/Entity.java b/...hgame/src/com/kiemax/entities/Entity.java → game/src/com/kiemax/entities/Entity.java
diff --git a/...rc/com/kiemax/entities/EntityManager.java → ...rc/com/kiemax/entities/EntityManager.java b/...rc/com/kiemax/entities/EntityManager.java → ...rc/com/kiemax/entities/EntityManager.java
@@ -3,13 +3,11 @@
 import java.awt.Graphics;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.ListIterator;
 
 import com.kiemax.entities.creature.Player;
 import com.kiemax.game.Handler;
 import com.kiemax.tiles.Tile;
-import com.kiemax.util.collisions.QuadTree;
 
 
 public class EntityManager {

diff --git a/...om/kiemax/entities/creature/Creature.java → ...om/kiemax/entities/creature/Creature.java b/...om/kiemax/entities/creature/Creature.java → ...om/kiemax/entities/creature/Creature.java
diff --git a/.../com/kiemax/entities/creature/Player.java → .../com/kiemax/entities/creature/Player.java b/.../com/kiemax/entities/creature/Player.java → .../com/kiemax/entities/creature/Player.java
@@ -1,6 +1,5 @@
 package com.kiemax.entities.creature;
 
-import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.util.ArrayList;

diff --git a/.../com/kiemax/entities/creature/Zombie.java → .../com/kiemax/entities/creature/Zombie.java b/.../com/kiemax/entities/creature/Zombie.java → .../com/kiemax/entities/creature/Zombie.java
diff --git a/.../com/kiemax/entities/projectiles/Die.java → .../com/kiemax/entities/projectiles/Die.java b/.../com/kiemax/entities/projectiles/Die.java → .../com/kiemax/entities/projectiles/Die.java
diff --git a/...emax/entities/projectiles/Projectile.java → ...emax/entities/projectiles/Projectile.java b/...emax/entities/projectiles/Projectile.java → ...emax/entities/projectiles/Projectile.java
diff --git a/...kiemax/entities/projectiles/Snowball.java → ...kiemax/entities/projectiles/Snowball.java b/...kiemax/entities/projectiles/Snowball.java → ...kiemax/entities/projectiles/Snowball.java
@@ -1,6 +1,5 @@
 package com.kiemax.entities.projectiles;
 
-import java.awt.Color;
 import java.awt.Graphics;
 import java.util.ArrayList;
 

diff --git a/...src/com/kiemax/entities/statics/Bush.java → ...src/com/kiemax/entities/statics/Bush.java b/...src/com/kiemax/entities/statics/Bush.java → ...src/com/kiemax/entities/statics/Bush.java
diff --git a/...kiemax/entities/statics/StaticEntity.java → ...kiemax/entities/statics/StaticEntity.java b/...kiemax/entities/statics/StaticEntity.java → ...kiemax/entities/statics/StaticEntity.java
diff --git a/game/noahgame/src/com/kiemax/game/Game.java → game/src/com/kiemax/game/Game.java b/game/noahgame/src/com/kiemax/game/Game.java → game/src/com/kiemax/game/Game.java
@@ -3,7 +3,6 @@
 import java.awt.Graphics;
 import java.awt.Rectangle;
 import java.awt.image.BufferStrategy;
-import java.awt.image.BufferedImage;
 
 import com.kiemax.display.Display;
 import com.kiemax.gfx.Camera;

diff --git a/...noahgame/src/com/kiemax/game/Handler.java → game/src/com/kiemax/game/Handler.java b/...noahgame/src/com/kiemax/game/Handler.java → game/src/com/kiemax/game/Handler.java
@@ -2,13 +2,11 @@
 
 import java.awt.image.BufferedImage;
 
-import com.kiemax.entities.EntityManager;
 import com.kiemax.gfx.Camera;
 import com.kiemax.gfx.PreLoaderImage;
 import com.kiemax.input.KeyManager;
 import com.kiemax.input.MouseManager;
 import com.kiemax.rooms.Room;
-import com.kiemax.util.audio.MusicManager;
 import com.kiemax.util.collisions.QuadTree;
 
 public class Handler {

diff --git a/...oahgame/src/com/kiemax/game/Launcher.java → game/src/com/kiemax/game/Launcher.java b/...oahgame/src/com/kiemax/game/Launcher.java → game/src/com/kiemax/game/Launcher.java
diff --git a/game/noahgame/src/com/kiemax/gfx/Assets.java → game/src/com/kiemax/gfx/Assets.java b/game/noahgame/src/com/kiemax/gfx/Assets.java → game/src/com/kiemax/gfx/Assets.java
diff --git a/game/noahgame/src/com/kiemax/gfx/Camera.java → game/src/com/kiemax/gfx/Camera.java b/game/noahgame/src/com/kiemax/gfx/Camera.java → game/src/com/kiemax/gfx/Camera.java
diff --git a/...ahgame/src/com/kiemax/gfx/FontLoader.java → game/src/com/kiemax/gfx/FontLoader.java b/...ahgame/src/com/kiemax/gfx/FontLoader.java → game/src/com/kiemax/gfx/FontLoader.java
@@ -2,9 +2,7 @@
 
 import java.awt.Font;
 import java.awt.FontFormatException;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 
 public class FontLoader {
 	public static Font loadFont(String path, float size) {

diff --git a/...hgame/src/com/kiemax/gfx/ImageLoader.java → game/src/com/kiemax/gfx/ImageLoader.java b/...hgame/src/com/kiemax/gfx/ImageLoader.java → game/src/com/kiemax/gfx/ImageLoader.java
diff --git a/...me/src/com/kiemax/gfx/PreLoaderImage.java → game/src/com/kiemax/gfx/PreLoaderImage.java b/...me/src/com/kiemax/gfx/PreLoaderImage.java → game/src/com/kiemax/gfx/PreLoaderImage.java
diff --git a/...hgame/src/com/kiemax/gfx/SpriteSheet.java → game/src/com/kiemax/gfx/SpriteSheet.java b/...hgame/src/com/kiemax/gfx/SpriteSheet.java → game/src/com/kiemax/gfx/SpriteSheet.java
diff --git a/game/noahgame/src/com/kiemax/gfx/Text.java → game/src/com/kiemax/gfx/Text.java b/game/noahgame/src/com/kiemax/gfx/Text.java → game/src/com/kiemax/gfx/Text.java
diff --git a/...game/src/com/kiemax/input/KeyManager.java → game/src/com/kiemax/input/KeyManager.java b/...game/src/com/kiemax/input/KeyManager.java → game/src/com/kiemax/input/KeyManager.java
diff --git a/...me/src/com/kiemax/input/MouseManager.java → game/src/com/kiemax/input/MouseManager.java b/...me/src/com/kiemax/input/MouseManager.java → game/src/com/kiemax/input/MouseManager.java
diff --git a/...e/src/com/kiemax/inventory/Inventory.java → game/src/com/kiemax/inventory/Inventory.java b/...e/src/com/kiemax/inventory/Inventory.java → game/src/com/kiemax/inventory/Inventory.java
@@ -75,8 +75,8 @@ public void render(Graphics g) {
 				System.out.println(selectedItem);
 				g.setColor(Color.white);
 				g.drawRect(handler.getWidth()/2 - 8 * texture.getWidth()/2 + ((selectedItem % 4)+1)*(48+spacingX)-48, handler.getHeight()/2 - 8 * texture.getHeight()/2 + ((int)Math.floor(selectedItem/4)+1)*(48+spacingY)-48, 54, 54);
-
-				g.drawImage(inventoryItems.get(x+ 4*y - offset).getTexture(), handler.getWidth()/2 - 8 * texture.getWidth()/2 + x*(48+spacingX)+15, handler.getHeight()/2 - 8 * texture.getHeight()/2 + y*(48+spacingY)+15, 48, 48, null);
+				if (inventoryItems.size() > x+ 4*y - offset)
+					g.drawImage(inventoryItems.get(x+ 4*y - offset).getTexture(), handler.getWidth()/2 - 8 * texture.getWidth()/2 + x*(48+spacingX)+15, handler.getHeight()/2 - 8 * texture.getHeight()/2 + y*(48+spacingY)+15, 48, 48, null);
 			}
 		}
 

diff --git a/...game/src/com/kiemax/items/ISkillTree.java → game/src/com/kiemax/items/ISkillTree.java b/...game/src/com/kiemax/items/ISkillTree.java → game/src/com/kiemax/items/ISkillTree.java
diff --git a/game/noahgame/src/com/kiemax/items/Item.java → game/src/com/kiemax/items/Item.java b/game/noahgame/src/com/kiemax/items/Item.java → game/src/com/kiemax/items/Item.java
diff --git a/...ame/src/com/kiemax/items/ItemManager.java → game/src/com/kiemax/items/ItemManager.java b/...ame/src/com/kiemax/items/ItemManager.java → game/src/com/kiemax/items/ItemManager.java
diff --git a/game/noahgame/src/com/kiemax/rooms/Room.java → game/src/com/kiemax/rooms/Room.java b/game/noahgame/src/com/kiemax/rooms/Room.java → game/src/com/kiemax/rooms/Room.java
@@ -5,7 +5,6 @@
 import com.kiemax.entities.EntityManager;
 import com.kiemax.entities.creature.Player;
 import com.kiemax.entities.creature.Zombie;
-import com.kiemax.entities.projectiles.Snowball;
 import com.kiemax.entities.statics.Bush;
 import com.kiemax.game.Handler;
 import com.kiemax.items.ItemManager;

diff --git a/...game/src/com/kiemax/states/GameState.java → game/src/com/kiemax/states/GameState.java b/...game/src/com/kiemax/states/GameState.java → game/src/com/kiemax/states/GameState.java
@@ -13,14 +13,13 @@ public class GameState extends State {
 	private Room room;
 	public GameState(Handler handler) {
 		super(handler);
-
 		if (roomId == 1) {
-			room = new Room(handler, "noahgame/assets/worlds/world1.rm");
+			room = new Room(handler, "worlds/world1.rm");
 		} else if (roomId == 2) {
-			room = new Room(handler, "noahgame/assets/worlds/world2.rm");
+			room = new Room(handler, "worlds/world2.rm");
 		}
-
 		handler.setRoom(room);
+
 
 	}
 	@Override

diff --git a/.../src/com/kiemax/states/MainMenuState.java → .../src/com/kiemax/states/MainMenuState.java b/.../src/com/kiemax/states/MainMenuState.java → .../src/com/kiemax/states/MainMenuState.java
diff --git a/...game/src/com/kiemax/states/MenuState.java → game/src/com/kiemax/states/MenuState.java b/...game/src/com/kiemax/states/MenuState.java → game/src/com/kiemax/states/MenuState.java
diff --git a/...noahgame/src/com/kiemax/states/State.java → game/src/com/kiemax/states/State.java b/...noahgame/src/com/kiemax/states/State.java → game/src/com/kiemax/states/State.java
diff --git a/...e/src/com/kiemax/states/StateManager.java → game/src/com/kiemax/states/StateManager.java b/...e/src/com/kiemax/states/StateManager.java → game/src/com/kiemax/states/StateManager.java
diff --git a/...iemax/tiles/BottomLeftCornerWallTile.java → ...iemax/tiles/BottomLeftCornerWallTile.java b/...iemax/tiles/BottomLeftCornerWallTile.java → ...iemax/tiles/BottomLeftCornerWallTile.java
diff --git a/...emax/tiles/BottomRightCornerWallTile.java → ...emax/tiles/BottomRightCornerWallTile.java b/...emax/tiles/BottomRightCornerWallTile.java → ...emax/tiles/BottomRightCornerWallTile.java
diff --git a/...hgame/src/com/kiemax/tiles/FloorTile.java → game/src/com/kiemax/tiles/FloorTile.java b/...hgame/src/com/kiemax/tiles/FloorTile.java → game/src/com/kiemax/tiles/FloorTile.java
diff --git a/.../com/kiemax/tiles/HorizontalWallTile.java → .../com/kiemax/tiles/HorizontalWallTile.java b/.../com/kiemax/tiles/HorizontalWallTile.java → .../com/kiemax/tiles/HorizontalWallTile.java
diff --git a/game/noahgame/src/com/kiemax/tiles/Tile.java → game/src/com/kiemax/tiles/Tile.java b/game/noahgame/src/com/kiemax/tiles/Tile.java → game/src/com/kiemax/tiles/Tile.java
diff --git a/...m/kiemax/tiles/TopLeftCornerWallTile.java → ...m/kiemax/tiles/TopLeftCornerWallTile.java b/...m/kiemax/tiles/TopLeftCornerWallTile.java → ...m/kiemax/tiles/TopLeftCornerWallTile.java
diff --git a/.../kiemax/tiles/TopRightCornerWallTile.java → .../kiemax/tiles/TopRightCornerWallTile.java b/.../kiemax/tiles/TopRightCornerWallTile.java → .../kiemax/tiles/TopRightCornerWallTile.java
diff --git a/...rc/com/kiemax/tiles/VerticalWallTile.java → ...rc/com/kiemax/tiles/VerticalWallTile.java b/...rc/com/kiemax/tiles/VerticalWallTile.java → ...rc/com/kiemax/tiles/VerticalWallTile.java
diff --git a/...ahgame/src/com/kiemax/tiles/WallTile.java → game/src/com/kiemax/tiles/WallTile.java b/...ahgame/src/com/kiemax/tiles/WallTile.java → game/src/com/kiemax/tiles/WallTile.java
diff --git a/...game/src/com/kiemax/ui/ClickListener.java → game/src/com/kiemax/ui/ClickListener.java b/...game/src/com/kiemax/ui/ClickListener.java → game/src/com/kiemax/ui/ClickListener.java
diff --git a/...game/src/com/kiemax/ui/UIImageButton.java → game/src/com/kiemax/ui/UIImageButton.java b/...game/src/com/kiemax/ui/UIImageButton.java → game/src/com/kiemax/ui/UIImageButton.java
diff --git a/...noahgame/src/com/kiemax/ui/UIManager.java → game/src/com/kiemax/ui/UIManager.java b/...noahgame/src/com/kiemax/ui/UIManager.java → game/src/com/kiemax/ui/UIManager.java
diff --git a/.../noahgame/src/com/kiemax/ui/UIObject.java → game/src/com/kiemax/ui/UIObject.java b/.../noahgame/src/com/kiemax/ui/UIObject.java → game/src/com/kiemax/ui/UIObject.java
diff --git a/game/src/com/kiemax/ui/UITextButton.java b/game/src/com/kiemax/ui/UITextButton.java
@@ -0,0 +1,5 @@
+package com.kiemax.ui;
+
+public class UITextButton {
+
+}
diff --git a/game/noahgame/src/com/kiemax/util/Utils.java → game/src/com/kiemax/util/Utils.java b/game/noahgame/src/com/kiemax/util/Utils.java → game/src/com/kiemax/util/Utils.java
@@ -10,15 +10,15 @@ public static String loadFileAsString(String path) {
 		StringBuilder builder = new StringBuilder();
 
 		try {
-			BufferedReader br = new BufferedReader(new FileReader(path));
+			BufferedReader br = new BufferedReader(new FileReader(Utils.class.getClassLoader().getResource(path).getPath()));
 			String line;
 			while((line = br.readLine()) != null)
 				builder.append(line + "\n");
 
 			br.close();
 		} catch(IOException e) {
 			e.printStackTrace();
-		}
+		} 
 		return builder.toString();
 	}
 	public static int parseInt(String number) {

diff --git a/.../src/com/kiemax/util/audio/AudioFile.java → .../src/com/kiemax/util/audio/AudioFile.java b/.../src/com/kiemax/util/audio/AudioFile.java → .../src/com/kiemax/util/audio/AudioFile.java
diff --git a/...c/com/kiemax/util/audio/MusicManager.java → ...c/com/kiemax/util/audio/MusicManager.java b/...c/com/kiemax/util/audio/MusicManager.java → ...c/com/kiemax/util/audio/MusicManager.java
@@ -1,22 +1,19 @@
 package com.kiemax.util.audio;
 
-import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.Clip;
-import javax.sound.sampled.DataLine;
-
 public class MusicManager implements Runnable {
 	private ArrayList<AudioFile> songList;
 	private int currentSongIndex;
 	private boolean running;
 	public MusicManager(String... songs) {
 		songList = new ArrayList<AudioFile>();
 		for(String song : songs) {
-			songList.add(new AudioFile("./noahgame/assets/sounds/music/" + song + ".wav"));
+			songList.add(new AudioFile(this.getClass().getClassLoader().getResource("sounds/music/" + song + ".wav").getPath()));
+
+
 		}
 		System.out.println(songList.size());
 	}

diff --git a/...kiemax/util/audio/SoundEffectManager.java → ...kiemax/util/audio/SoundEffectManager.java b/...kiemax/util/audio/SoundEffectManager.java → ...kiemax/util/audio/SoundEffectManager.java
@@ -10,7 +10,9 @@ public class SoundEffectManager implements Runnable {
 	public SoundEffectManager(String... sounds) {
 		soundList = new ArrayList<AudioFile>();
 		for(String sound : sounds) {
-			soundList.add(new AudioFile("./noahgame/assets/sounds/sfx/" + sound + ".wav"));
+
+			soundList.add(new AudioFile(this.getClass().getClassLoader().getResource("sounds/sfx/" + sound + ".wav").getPath()));
+
 		}
 
 	}

diff --git a/.../com/kiemax/util/collisions/QuadTree.java → .../com/kiemax/util/collisions/QuadTree.java b/.../com/kiemax/util/collisions/QuadTree.java → .../com/kiemax/util/collisions/QuadTree.java
@@ -4,9 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.kiemax.game.Handler;
-import com.kiemax.rooms.Room;
-
 /**
  * A lot of this code was stolen from this article: <br>
  * http://gamedevelopment.tutsplus.com/tutorials/quick-tip-use-quadtrees-to-detect-likely-collisions-in-2d-space--gamedev-374

diff --git a/.../com/kiemax/util/collisions/Sizeable.java → .../com/kiemax/util/collisions/Sizeable.java b/.../com/kiemax/util/collisions/Sizeable.java → .../com/kiemax/util/collisions/Sizeable.java