From 1278f39977bc34d92c2aba932e1d3eed4a2cb2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Thu, 24 Jun 2021 18:39:34 +0200 Subject: [PATCH] Reorganized project to fit Maven's directory structure. --- .classpath | 8 ++---- pom.xml | 19 +++++++++++-- .../loader/ControllerPromptTextureLoader.java | 26 ------------------ src/{ => main/java}/Main.java | 0 src/{ => main/java}/engine/Engine.java | 0 src/{ => main/java}/engine/TestEngine.java | 0 src/{ => main/java}/engine/camera/Camera.java | 0 .../java}/engine/camera/TrackingDummy.java | 0 .../engine/camera/TrackingSF3ThirdStrick.java | 0 .../java}/engine/camera/TrackingTore.java | 0 .../java}/engine/graphics/Shader.java | 0 .../java}/engine/graphics/Texture.java | 2 +- .../java}/engine/graphics/VertexArray.java | 0 src/{ => main/java}/engine/gui/UIDummy.java | 0 src/{ => main/java}/engine/gui/UIElement.java | 0 .../java}/engine/gui/UIElementText.java | 0 .../java}/engine/gui/UIInputList.java | 0 src/{ => main/java}/engine/input/Button.java | 0 .../java}/engine/input/GamepadInput.java | 0 .../java}/engine/input/InputConst.java | 0 .../java}/engine/input/KeyboardInput.java | 0 .../loader/ControllerPromptTextureLoader.java | 26 ++++++++++++++++++ src/{ => main/java}/engine/math/Matrix4f.java | 0 .../java}/engine/math/Primitive.java | 0 src/{ => main/java}/engine/math/Vector3f.java | 0 src/{ => main/java}/engine/object/Hitbox.java | 2 +- .../engine/object/HorizontalProgressBar.java | 2 +- src/{ => main/java}/engine/object/Letter.java | 0 .../java}/engine/object/ObjectGl.java | 8 +++--- src/{ => main/java}/engine/object/SortZ.java | 0 src/{ => main/java}/engine/object/Sprite.java | 2 +- .../java}/engine/object_wrapper/Text.java | 4 +-- src/{ => main/java}/engine/package-info.java | 0 .../java}/engine/sound/SoundBuffer.java | 0 .../java}/engine/sound/SoundListener.java | 0 .../java}/engine/sound/SoundManager.java | 0 .../java}/engine/sound/SoundSource.java | 0 .../java}/engine/utils/BufferUtilsEngine.java | 0 .../java}/engine/utils/FileUtils.java | 4 ++- .../java}/engine/utils/ShaderUtils.java | 0 .../Characters/Blue/BlueBaseFrames.java | 0 .../gameplay/Characters/Blue/BlueMisc.java | 0 .../gameplay/Characters/Blue/BlueNormals.java | 0 .../Characters/Blue/BlueSpecials.java | 0 .../Characters/Blue/CharacterBlue.java | 0 .../java}/gameplay/actions/Action.java | 0 .../java}/gameplay/actions/Attack.java | 0 .../java}/gameplay/actions/Dash.java | 0 .../java}/gameplay/actions/Jump.java | 0 .../java}/gameplay/actions/Throw.java | 0 .../java}/gameplay/actions/ThrowPart.java | 0 .../java}/gameplay/actions/attackPart.java | 0 .../java}/gameplay/entities/Character.java | 0 .../java}/gameplay/entities/Entity.java | 0 .../java}/gameplay/entities/Projectile.java | 0 .../java}/gameplay/entities/Status.java | 0 .../java}/gameplay/frames/Frame.java | 0 .../gameplay/hitboxes/Active_HitBox.java | 0 .../hitboxes/Active_throw_Hitbox.java | 0 .../java}/gameplay/hitboxes/HitBox.java | 0 .../gameplay/hitboxes/Passive_HitBox.java | 0 .../hitboxes/Passive_throw_HitBox.java | 0 .../java}/gameplay/hitboxes/Push_HitBox.java | 0 .../java}/gameplay/input/ButtonIG.java | 0 .../java}/gameplay/input/InputBuffer.java | 0 .../java}/gameplay/input/Inputs.java | 0 src/{ => main/java}/gameplay/match/match.java | 20 +++++++------- .../java}/gameplay/match/sprite_zorder.txt | 0 src/{ => main/java}/launcher/Launcher.java | 0 src/{ => main/java}/launcher/Settings.java | 0 .../resources}/launcher/charfaces/blue.png | Bin .../resources/launcher/charfaces}/default.png | Bin .../resources}/launcher/launcher.fxml | 4 +-- src/{ => main/resources}/launcher/logo.png | Bin src/{ => main/resources}/launcher/style.css | 0 .../resources/shaders}/ObjectGl/frag.glsl | 0 .../resources/shaders}/ObjectGl/vert.glsl | 0 .../shaders}/ObjectGlColor/frag.glsl | 0 .../shaders}/ObjectGlColor/vert.glsl | 0 .../resources/shaders}/ObjectGlTex/frag.glsl | 0 .../resources/shaders}/ObjectGlTex/vert.glsl | 0 .../shaders}/ObjectGlTexColor/frag.glsl | 0 .../shaders}/ObjectGlTexColor/vert.glsl | 0 .../StylishShaders/BasicNoTexVert.glsl | 0 .../shaders}/StylishShaders/BasicVert.glsl | 0 .../shaders}/StylishShaders/FlashFrag.glsl | 0 .../shaders}/StylishShaders/HitboxFrag.glsl | 0 .../HorizontalProgressBarFrag.glsl | 0 ...rizontalProgressBarGradientSquareFrag.glsl | 0 .../shaders}/StylishShaders/TextFrag.glsl | 0 .../shaders}/StylishShaders/WavyTextVert.glsl | 0 {sound => src/main/resources/sound}/jump.ogg | Bin .../main/resources/textures}/Sprite_9comp.png | Bin .../textures}/Sprite_sans_grille_9comp.png | Bin .../main/resources/textures}/arena1.png | Bin .../main/resources/textures}/awesomeface.png | Bin .../resources/textures}/background_beach.png | Bin .../main/resources/textures}/container.jpg | Bin .../resources/textures}/dejavu10x10_gs_tc.png | Bin .../main/resources/textures}/health_bar.png | Bin .../textures}/health_bar_9compress.png | Bin .../Controller_Disconnected.png | Bin .../textures}/keyboard_pad_glyphs/Readme.txt | 0 .../arrows/Directional_Arrow_Cross.png | Bin .../arrows/Directional_Arrow_Diagonal.png | Bin .../arrows/Directional_Arrow_Full_Circle.png | Bin .../arrows/Directional_Arrow_Half_Circle.png | Bin .../arrows/Directional_Arrow_Horizontal.png | Bin .../Directional_Arrow_Quarter_Circle.png | Bin .../arrows/Directional_Arrow_Sides.png | Bin .../arrows/Directional_Arrow_Straight.png | Bin .../arrows/Directional_Arrow_Vertical.png | Bin .../keyboard/0_Key_Dark.png | Bin .../keyboard/10_Key_Dark.png | Bin .../keyboard/11_Key_Dark.png | Bin .../keyboard/12_Key_Dark.png | Bin .../keyboard/1_Key_Dark.png | Bin .../keyboard/2_Key_Dark.png | Bin .../keyboard/3_Key_Dark.png | Bin .../keyboard/4_Key_Dark.png | Bin .../keyboard/5_Key_Dark.png | Bin .../keyboard/6_Key_Dark.png | Bin .../keyboard/7_Key_Dark.png | Bin .../keyboard/8_Key_Dark.png | Bin .../keyboard/9_Key_Dark.png | Bin .../keyboard/A_Key_Dark.png | Bin .../keyboard/Alt_Key_Dark.png | Bin .../keyboard/Arrow_Down_Key_Dark.png | Bin .../keyboard/Arrow_Left_Key_Dark.png | Bin .../keyboard/Arrow_Right_Key_Dark.png | Bin .../keyboard/Arrow_Up_Key_Dark.png | Bin .../keyboard/Asterisk_Key_Dark.png | Bin .../keyboard/B_Key_Dark.png | Bin .../keyboard/Backspace_Alt_Key_Dark.png | Bin .../keyboard/Backspace_Key_Dark.png | Bin .../keyboard/Bracket_Left_Key_Dark.png | Bin .../keyboard/Bracket_Right_Key_Dark.png | Bin .../keyboard/C_Key_Dark.png | Bin .../keyboard/Caps_Lock_Key_Dark.png | Bin .../keyboard/Command_Key_Dark.png | Bin .../keyboard/Ctrl_Key_Dark.png | Bin .../keyboard/D_Key_Dark.png | Bin .../keyboard/Del_Key_Dark.png | Bin .../keyboard/E_Key_Dark.png | Bin .../keyboard/End_Key_Dark.png | Bin .../keyboard/Enter_Alt_Key_Dark.png | Bin .../keyboard/Enter_Key_Dark.png | Bin .../keyboard/Enter_Tall_Key_Dark.png | Bin .../keyboard/Esc_Key_Dark.png | Bin .../keyboard/F10_Key_Dark.png | Bin .../keyboard/F11_Key_Dark.png | Bin .../keyboard/F12_Key_Dark.png | Bin .../keyboard/F1_Key_Dark.png | Bin .../keyboard/F2_Key_Dark.png | Bin .../keyboard/F3_Key_Dark.png | Bin .../keyboard/F4_Key_Dark.png | Bin .../keyboard/F5_Key_Dark.png | Bin .../keyboard/F6_Key_Dark.png | Bin .../keyboard/F7_Key_Dark.png | Bin .../keyboard/F8_Key_Dark.png | Bin .../keyboard/F9_Key_Dark.png | Bin .../keyboard/F_Key_Dark.png | Bin .../keyboard/G_Key_Dark.png | Bin .../keyboard/H_Key_Dark.png | Bin .../keyboard/Home_Key_Dark.png | Bin .../keyboard/I_Key_Dark.png | Bin .../keyboard/Insert_Key_Dark.png | Bin .../keyboard/J_Key_Dark.png | Bin .../keyboard/K_Key_Dark.png | Bin .../keyboard/L_Key_Dark.png | Bin .../keyboard/M_Key_Dark.png | Bin .../keyboard/Mark_Left_Key_Dark.png | Bin .../keyboard/Mark_Right_Key_Dark.png | Bin .../keyboard/Minus_Key_Dark.png | Bin .../keyboard/Mouse_Left_Key_Dark.png | Bin .../keyboard/Mouse_Middle_Key_Dark.png | Bin .../keyboard/Mouse_Right_Key_Dark.png | Bin .../keyboard/Mouse_Simple_Key_Dark.png | Bin .../keyboard/N_Key_Dark.png | Bin .../keyboard/Num_Lock_Key_Dark.png | Bin .../keyboard/O_Key_Dark.png | Bin .../keyboard/P_Key_Dark.png | Bin .../keyboard/Page_Down_Key_Dark.png | Bin .../keyboard/Page_Up_Key_Dark.png | Bin .../keyboard/Plus_Key_Dark.png | Bin .../keyboard/Plus_Tall_Key_Dark.png | Bin .../keyboard/Print_Screen_Key_Dark.png | Bin .../keyboard/Q_Key_Dark.png | Bin .../keyboard/Question_Key_Dark.png | Bin .../keyboard/Quote_Key_Dark.png | Bin .../keyboard/R_Key_Dark.png | Bin .../keyboard/S_Key_Dark.png | Bin .../keyboard/Semicolon_Key_Dark.png | Bin .../keyboard/Shift_Alt_Key_Dark.png | Bin .../keyboard/Shift_Key_Dark.png | Bin .../keyboard/Slash_Key_Dark.png | Bin .../keyboard/Space_Key_Dark.png | Bin .../keyboard/T_Key_Dark.png | Bin .../keyboard/Tab_Key_Dark.png | Bin .../keyboard/Tilda_Key_Dark.png | Bin .../keyboard/U_Key_Dark.png | Bin .../keyboard/V_Key_Dark.png | Bin .../keyboard/W_Key_Dark.png | Bin .../keyboard/Win_Key_Dark.png | Bin .../keyboard/X_Key_Dark.png | Bin .../keyboard/Y_Key_Dark.png | Bin .../keyboard/Z_Key_Dark.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_A.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_B.png | Bin .../xbox/XboxOne_Diagram.png | Bin .../xbox/XboxOne_Diagram_Simple.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_Dpad.png | Bin .../xbox/XboxOne_Dpad_Down.png | Bin .../xbox/XboxOne_Dpad_Left.png | Bin .../xbox/XboxOne_Dpad_Right.png | Bin .../xbox/XboxOne_Dpad_Up.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_LB.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_LT.png | Bin .../xbox/XboxOne_Left_Stick.png | Bin .../xbox/XboxOne_Left_Stick_Click.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_Menu.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_RB.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_RT.png | Bin .../xbox/XboxOne_Right_Stick.png | Bin .../xbox/XboxOne_Right_Stick_Click.png | Bin .../xbox/XboxOne_Windows.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_X.png | Bin .../keyboard_pad_glyphs/xbox/XboxOne_Y.png | Bin .../main/resources/textures}/shadow.png | Bin .../resources/textures}/sprite_action.txt | 0 .../resources/textures}/zangief_sprite.png | Bin 231 files changed, 70 insertions(+), 57 deletions(-) delete mode 100644 src/engine/loader/ControllerPromptTextureLoader.java rename src/{ => main/java}/Main.java (100%) rename src/{ => main/java}/engine/Engine.java (100%) rename src/{ => main/java}/engine/TestEngine.java (100%) rename src/{ => main/java}/engine/camera/Camera.java (100%) rename src/{ => main/java}/engine/camera/TrackingDummy.java (100%) rename src/{ => main/java}/engine/camera/TrackingSF3ThirdStrick.java (100%) rename src/{ => main/java}/engine/camera/TrackingTore.java (100%) rename src/{ => main/java}/engine/graphics/Shader.java (100%) rename src/{ => main/java}/engine/graphics/Texture.java (95%) rename src/{ => main/java}/engine/graphics/VertexArray.java (100%) rename src/{ => main/java}/engine/gui/UIDummy.java (100%) rename src/{ => main/java}/engine/gui/UIElement.java (100%) rename src/{ => main/java}/engine/gui/UIElementText.java (100%) rename src/{ => main/java}/engine/gui/UIInputList.java (100%) rename src/{ => main/java}/engine/input/Button.java (100%) rename src/{ => main/java}/engine/input/GamepadInput.java (100%) rename src/{ => main/java}/engine/input/InputConst.java (100%) rename src/{ => main/java}/engine/input/KeyboardInput.java (100%) create mode 100644 src/main/java/engine/loader/ControllerPromptTextureLoader.java rename src/{ => main/java}/engine/math/Matrix4f.java (100%) rename src/{ => main/java}/engine/math/Primitive.java (100%) rename src/{ => main/java}/engine/math/Vector3f.java (100%) rename src/{ => main/java}/engine/object/Hitbox.java (84%) rename src/{ => main/java}/engine/object/HorizontalProgressBar.java (92%) rename src/{ => main/java}/engine/object/Letter.java (100%) rename src/{ => main/java}/engine/object/ObjectGl.java (95%) rename src/{ => main/java}/engine/object/SortZ.java (100%) rename src/{ => main/java}/engine/object/Sprite.java (94%) rename src/{ => main/java}/engine/object_wrapper/Text.java (95%) rename src/{ => main/java}/engine/package-info.java (100%) rename src/{ => main/java}/engine/sound/SoundBuffer.java (100%) rename src/{ => main/java}/engine/sound/SoundListener.java (100%) rename src/{ => main/java}/engine/sound/SoundManager.java (100%) rename src/{ => main/java}/engine/sound/SoundSource.java (100%) rename src/{ => main/java}/engine/utils/BufferUtilsEngine.java (100%) rename src/{ => main/java}/engine/utils/FileUtils.java (88%) rename src/{ => main/java}/engine/utils/ShaderUtils.java (100%) rename src/{ => main/java}/gameplay/Characters/Blue/BlueBaseFrames.java (100%) rename src/{ => main/java}/gameplay/Characters/Blue/BlueMisc.java (100%) rename src/{ => main/java}/gameplay/Characters/Blue/BlueNormals.java (100%) rename src/{ => main/java}/gameplay/Characters/Blue/BlueSpecials.java (100%) rename src/{ => main/java}/gameplay/Characters/Blue/CharacterBlue.java (100%) rename src/{ => main/java}/gameplay/actions/Action.java (100%) rename src/{ => main/java}/gameplay/actions/Attack.java (100%) rename src/{ => main/java}/gameplay/actions/Dash.java (100%) rename src/{ => main/java}/gameplay/actions/Jump.java (100%) rename src/{ => main/java}/gameplay/actions/Throw.java (100%) rename src/{ => main/java}/gameplay/actions/ThrowPart.java (100%) rename src/{ => main/java}/gameplay/actions/attackPart.java (100%) rename src/{ => main/java}/gameplay/entities/Character.java (100%) rename src/{ => main/java}/gameplay/entities/Entity.java (100%) rename src/{ => main/java}/gameplay/entities/Projectile.java (100%) rename src/{ => main/java}/gameplay/entities/Status.java (100%) rename src/{ => main/java}/gameplay/frames/Frame.java (100%) rename src/{ => main/java}/gameplay/hitboxes/Active_HitBox.java (100%) rename src/{ => main/java}/gameplay/hitboxes/Active_throw_Hitbox.java (100%) rename src/{ => main/java}/gameplay/hitboxes/HitBox.java (100%) rename src/{ => main/java}/gameplay/hitboxes/Passive_HitBox.java (100%) rename src/{ => main/java}/gameplay/hitboxes/Passive_throw_HitBox.java (100%) rename src/{ => main/java}/gameplay/hitboxes/Push_HitBox.java (100%) rename src/{ => main/java}/gameplay/input/ButtonIG.java (100%) rename src/{ => main/java}/gameplay/input/InputBuffer.java (100%) rename src/{ => main/java}/gameplay/input/Inputs.java (100%) rename src/{ => main/java}/gameplay/match/match.java (97%) rename src/{ => main/java}/gameplay/match/sprite_zorder.txt (100%) rename src/{ => main/java}/launcher/Launcher.java (100%) rename src/{ => main/java}/launcher/Settings.java (100%) rename src/{ => main/resources}/launcher/charfaces/blue.png (100%) rename src/{launcher => main/resources/launcher/charfaces}/default.png (100%) rename src/{ => main/resources}/launcher/launcher.fxml (96%) rename src/{ => main/resources}/launcher/logo.png (100%) rename src/{ => main/resources}/launcher/style.css (100%) rename {shaders => src/main/resources/shaders}/ObjectGl/frag.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGl/vert.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlColor/frag.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlColor/vert.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlTex/frag.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlTex/vert.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlTexColor/frag.glsl (100%) rename {shaders => src/main/resources/shaders}/ObjectGlTexColor/vert.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/BasicNoTexVert.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/BasicVert.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/FlashFrag.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/HitboxFrag.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/HorizontalProgressBarFrag.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/TextFrag.glsl (100%) rename {shaders => src/main/resources/shaders}/StylishShaders/WavyTextVert.glsl (100%) rename {sound => src/main/resources/sound}/jump.ogg (100%) rename {textures => src/main/resources/textures}/Sprite_9comp.png (100%) rename {textures => src/main/resources/textures}/Sprite_sans_grille_9comp.png (100%) rename {textures => src/main/resources/textures}/arena1.png (100%) rename {textures => src/main/resources/textures}/awesomeface.png (100%) rename {textures => src/main/resources/textures}/background_beach.png (100%) rename {textures => src/main/resources/textures}/container.jpg (100%) rename {textures => src/main/resources/textures}/dejavu10x10_gs_tc.png (100%) rename {textures => src/main/resources/textures}/health_bar.png (100%) rename {textures => src/main/resources/textures}/health_bar_9compress.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/Controller_Disconnected.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/Readme.txt (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Cross.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Diagonal.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Full_Circle.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Half_Circle.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Horizontal.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Quarter_Circle.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Sides.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Straight.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/arrows/Directional_Arrow_Vertical.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/0_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/10_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/11_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/12_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/1_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/2_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/3_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/4_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/5_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/6_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/7_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/8_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/9_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/A_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Alt_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Arrow_Down_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Arrow_Left_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Arrow_Right_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Arrow_Up_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Asterisk_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/B_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Backspace_Alt_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Backspace_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Bracket_Left_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Bracket_Right_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/C_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Caps_Lock_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Command_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Ctrl_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/D_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Del_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/E_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/End_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Enter_Alt_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Enter_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Enter_Tall_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Esc_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F10_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F11_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F12_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F1_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F2_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F3_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F4_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F5_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F6_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F7_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F8_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F9_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/F_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/G_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/H_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Home_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/I_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Insert_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/J_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/K_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/L_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/M_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mark_Left_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mark_Right_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Minus_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mouse_Left_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mouse_Middle_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mouse_Right_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Mouse_Simple_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/N_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Num_Lock_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/O_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/P_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Page_Down_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Page_Up_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Plus_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Plus_Tall_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Print_Screen_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Q_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Question_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Quote_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/R_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/S_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Semicolon_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Shift_Alt_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Shift_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Slash_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Space_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/T_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Tab_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Tilda_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/U_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/V_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/W_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Win_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/X_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Y_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/keyboard/Z_Key_Dark.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_A.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_B.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Diagram.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Diagram_Simple.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Dpad.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_LB.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_LT.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick_Click.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Menu.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_RB.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_RT.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick_Click.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Windows.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_X.png (100%) rename {textures => src/main/resources/textures}/keyboard_pad_glyphs/xbox/XboxOne_Y.png (100%) rename {textures => src/main/resources/textures}/shadow.png (100%) rename {textures => src/main/resources/textures}/sprite_action.txt (100%) rename {textures => src/main/resources/textures}/zangief_sprite.png (100%) diff --git a/.classpath b/.classpath index 914add1..2daff1b 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,9 @@ - - - - - - + + diff --git a/pom.xml b/pom.xml index 5593d30..0d795e3 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,6 @@ - src - @@ -26,6 +24,22 @@ 11 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + + true + lib/ + Main + + + + @@ -36,6 +50,7 @@ 3.2.3 natives-windows 11 + 11 diff --git a/src/engine/loader/ControllerPromptTextureLoader.java b/src/engine/loader/ControllerPromptTextureLoader.java deleted file mode 100644 index c759bb8..0000000 --- a/src/engine/loader/ControllerPromptTextureLoader.java +++ /dev/null @@ -1,26 +0,0 @@ -package engine.loader; - -import engine.graphics.Texture; - -public class ControllerPromptTextureLoader { - - public Texture up; - public Texture down; - public Texture left; - public Texture right; - public Texture X; - public Texture A; - public Texture Y; - public Texture B; - - public ControllerPromptTextureLoader(){ - up = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png", 0); - down = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png", 0); - left = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png", 0); - right = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png", 0); - A = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_A.png", 0); - B = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_B.png", 0); - X = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_X.png", 0); - Y = new Texture("textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png", 0); - } -} diff --git a/src/Main.java b/src/main/java/Main.java similarity index 100% rename from src/Main.java rename to src/main/java/Main.java diff --git a/src/engine/Engine.java b/src/main/java/engine/Engine.java similarity index 100% rename from src/engine/Engine.java rename to src/main/java/engine/Engine.java diff --git a/src/engine/TestEngine.java b/src/main/java/engine/TestEngine.java similarity index 100% rename from src/engine/TestEngine.java rename to src/main/java/engine/TestEngine.java diff --git a/src/engine/camera/Camera.java b/src/main/java/engine/camera/Camera.java similarity index 100% rename from src/engine/camera/Camera.java rename to src/main/java/engine/camera/Camera.java diff --git a/src/engine/camera/TrackingDummy.java b/src/main/java/engine/camera/TrackingDummy.java similarity index 100% rename from src/engine/camera/TrackingDummy.java rename to src/main/java/engine/camera/TrackingDummy.java diff --git a/src/engine/camera/TrackingSF3ThirdStrick.java b/src/main/java/engine/camera/TrackingSF3ThirdStrick.java similarity index 100% rename from src/engine/camera/TrackingSF3ThirdStrick.java rename to src/main/java/engine/camera/TrackingSF3ThirdStrick.java diff --git a/src/engine/camera/TrackingTore.java b/src/main/java/engine/camera/TrackingTore.java similarity index 100% rename from src/engine/camera/TrackingTore.java rename to src/main/java/engine/camera/TrackingTore.java diff --git a/src/engine/graphics/Shader.java b/src/main/java/engine/graphics/Shader.java similarity index 100% rename from src/engine/graphics/Shader.java rename to src/main/java/engine/graphics/Shader.java diff --git a/src/engine/graphics/Texture.java b/src/main/java/engine/graphics/Texture.java similarity index 95% rename from src/engine/graphics/Texture.java rename to src/main/java/engine/graphics/Texture.java index 15e5a19..7e1ed96 100644 --- a/src/engine/graphics/Texture.java +++ b/src/main/java/engine/graphics/Texture.java @@ -26,7 +26,7 @@ public class Texture { private int load(String path) { int[] pixels = null; try { - BufferedImage image = ImageIO.read(new FileInputStream(path)); + BufferedImage image = ImageIO.read(getClass().getResourceAsStream(path)); width = image.getWidth(); height = image.getHeight(); pixels = new int[width * height]; diff --git a/src/engine/graphics/VertexArray.java b/src/main/java/engine/graphics/VertexArray.java similarity index 100% rename from src/engine/graphics/VertexArray.java rename to src/main/java/engine/graphics/VertexArray.java diff --git a/src/engine/gui/UIDummy.java b/src/main/java/engine/gui/UIDummy.java similarity index 100% rename from src/engine/gui/UIDummy.java rename to src/main/java/engine/gui/UIDummy.java diff --git a/src/engine/gui/UIElement.java b/src/main/java/engine/gui/UIElement.java similarity index 100% rename from src/engine/gui/UIElement.java rename to src/main/java/engine/gui/UIElement.java diff --git a/src/engine/gui/UIElementText.java b/src/main/java/engine/gui/UIElementText.java similarity index 100% rename from src/engine/gui/UIElementText.java rename to src/main/java/engine/gui/UIElementText.java diff --git a/src/engine/gui/UIInputList.java b/src/main/java/engine/gui/UIInputList.java similarity index 100% rename from src/engine/gui/UIInputList.java rename to src/main/java/engine/gui/UIInputList.java diff --git a/src/engine/input/Button.java b/src/main/java/engine/input/Button.java similarity index 100% rename from src/engine/input/Button.java rename to src/main/java/engine/input/Button.java diff --git a/src/engine/input/GamepadInput.java b/src/main/java/engine/input/GamepadInput.java similarity index 100% rename from src/engine/input/GamepadInput.java rename to src/main/java/engine/input/GamepadInput.java diff --git a/src/engine/input/InputConst.java b/src/main/java/engine/input/InputConst.java similarity index 100% rename from src/engine/input/InputConst.java rename to src/main/java/engine/input/InputConst.java diff --git a/src/engine/input/KeyboardInput.java b/src/main/java/engine/input/KeyboardInput.java similarity index 100% rename from src/engine/input/KeyboardInput.java rename to src/main/java/engine/input/KeyboardInput.java diff --git a/src/main/java/engine/loader/ControllerPromptTextureLoader.java b/src/main/java/engine/loader/ControllerPromptTextureLoader.java new file mode 100644 index 0000000..338273c --- /dev/null +++ b/src/main/java/engine/loader/ControllerPromptTextureLoader.java @@ -0,0 +1,26 @@ +package engine.loader; + +import engine.graphics.Texture; + +public class ControllerPromptTextureLoader { + + public Texture up; + public Texture down; + public Texture left; + public Texture right; + public Texture X; + public Texture A; + public Texture Y; + public Texture B; + + public ControllerPromptTextureLoader(){ + up = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png", 0); + down = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png", 0); + left = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png", 0); + right = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png", 0); + A = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_A.png", 0); + B = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_B.png", 0); + X = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_X.png", 0); + Y = new Texture("/textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png", 0); + } +} diff --git a/src/engine/math/Matrix4f.java b/src/main/java/engine/math/Matrix4f.java similarity index 100% rename from src/engine/math/Matrix4f.java rename to src/main/java/engine/math/Matrix4f.java diff --git a/src/engine/math/Primitive.java b/src/main/java/engine/math/Primitive.java similarity index 100% rename from src/engine/math/Primitive.java rename to src/main/java/engine/math/Primitive.java diff --git a/src/engine/math/Vector3f.java b/src/main/java/engine/math/Vector3f.java similarity index 100% rename from src/engine/math/Vector3f.java rename to src/main/java/engine/math/Vector3f.java diff --git a/src/engine/object/Hitbox.java b/src/main/java/engine/object/Hitbox.java similarity index 84% rename from src/engine/object/Hitbox.java rename to src/main/java/engine/object/Hitbox.java index 67528e7..f70c2b5 100644 --- a/src/engine/object/Hitbox.java +++ b/src/main/java/engine/object/Hitbox.java @@ -8,7 +8,7 @@ public class Hitbox extends ObjectGl{ public Hitbox(float z, float w, float h, float size, Vector3f color) { super(z, w, h, size, null, color); - this.setShader("shaders/ObjectGlColor/vert.glsl", "shaders/StylishShaders/HitboxFrag.glsl"); + this.setShader("/shaders/ObjectGlColor/vert.glsl", "/shaders/StylishShaders/HitboxFrag.glsl"); } diff --git a/src/engine/object/HorizontalProgressBar.java b/src/main/java/engine/object/HorizontalProgressBar.java similarity index 92% rename from src/engine/object/HorizontalProgressBar.java rename to src/main/java/engine/object/HorizontalProgressBar.java index 8d870e7..d2f9944 100644 --- a/src/engine/object/HorizontalProgressBar.java +++ b/src/main/java/engine/object/HorizontalProgressBar.java @@ -17,7 +17,7 @@ public class HorizontalProgressBar extends ObjectGl { this.current = current; this.leftToRight = leftToRight ? 1 : 0; this.useHeight = false; - this.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarFrag.glsl"); + this.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarFrag.glsl"); } public void setCurrent(float newCurrent) { diff --git a/src/engine/object/Letter.java b/src/main/java/engine/object/Letter.java similarity index 100% rename from src/engine/object/Letter.java rename to src/main/java/engine/object/Letter.java diff --git a/src/engine/object/ObjectGl.java b/src/main/java/engine/object/ObjectGl.java similarity index 95% rename from src/engine/object/ObjectGl.java rename to src/main/java/engine/object/ObjectGl.java index 5d1426b..01f37d0 100644 --- a/src/engine/object/ObjectGl.java +++ b/src/main/java/engine/object/ObjectGl.java @@ -79,13 +79,13 @@ public class ObjectGl { // use different shader for each set of option if (tex == null && color == null){ - this.shader = new Shader("shaders/ObjectGl/vert.glsl","shaders/ObjectGl/frag.glsl"); + this.shader = new Shader("/shaders/ObjectGl/vert.glsl","/shaders/ObjectGl/frag.glsl"); } else if (tex == null){ - this.shader = new Shader("shaders/ObjectGlColor/vert.glsl","shaders/ObjectGlColor/frag.glsl"); + this.shader = new Shader("/shaders/ObjectGlColor/vert.glsl","/shaders/ObjectGlColor/frag.glsl"); } else if (color == null){ - this.shader = new Shader("shaders/ObjectGlTex/vert.glsl","shaders/ObjectGlTex/frag.glsl"); + this.shader = new Shader("/shaders/ObjectGlTex/vert.glsl","/shaders/ObjectGlTex/frag.glsl"); } else { - this.shader = new Shader("shaders/ObjectGlTexColor/vert.glsl","shaders/ObjectGlTexColor/frag.glsl"); + this.shader = new Shader("/shaders/ObjectGlTexColor/vert.glsl","/shaders/ObjectGlTexColor/frag.glsl"); } } diff --git a/src/engine/object/SortZ.java b/src/main/java/engine/object/SortZ.java similarity index 100% rename from src/engine/object/SortZ.java rename to src/main/java/engine/object/SortZ.java diff --git a/src/engine/object/Sprite.java b/src/main/java/engine/object/Sprite.java similarity index 94% rename from src/engine/object/Sprite.java rename to src/main/java/engine/object/Sprite.java index 116edb9..aac549a 100644 --- a/src/engine/object/Sprite.java +++ b/src/main/java/engine/object/Sprite.java @@ -31,7 +31,7 @@ public class Sprite extends ObjectGl { * Ajoute une ombre sous le personnage */ public void setShadow(){ - this.shadow = new ObjectGl(this.zPos, this.width, this.height * 0.3f, this.scalingFactor, "textures/shadow.png", null); + this.shadow = new ObjectGl(this.zPos, this.width, this.height * 0.3f, this.scalingFactor, "/textures/shadow.png", null); this.shadow.translate(new Vector3f(this.xPos, this.yPos - this.height * 4.3f, -8f)); // 8 ça fait bcp mais y du z-fighting sinon jsp pk } diff --git a/src/engine/object_wrapper/Text.java b/src/main/java/engine/object_wrapper/Text.java similarity index 95% rename from src/engine/object_wrapper/Text.java rename to src/main/java/engine/object_wrapper/Text.java index d1ba373..8539b64 100644 --- a/src/engine/object_wrapper/Text.java +++ b/src/main/java/engine/object_wrapper/Text.java @@ -103,8 +103,8 @@ public class Text { } private Letter charToObjectGl(char a, int index){ - Letter objectGl = new Letter(this.zPos, 1.0f, 1.0f, this.size, "textures/dejavu10x10_gs_tc.png", null, index); - objectGl.setShader("shaders/StylishShaders/BasicVert.glsl","shaders/StylishShaders/TextFrag.glsl"); + Letter objectGl = new Letter(this.zPos, 1.0f, 1.0f, this.size, "/textures/dejavu10x10_gs_tc.png", null, index); + objectGl.setShader("/shaders/StylishShaders/BasicVert.glsl","/shaders/StylishShaders/TextFrag.glsl"); ObjectGlSetCharWrap(a, objectGl); return objectGl; } diff --git a/src/engine/package-info.java b/src/main/java/engine/package-info.java similarity index 100% rename from src/engine/package-info.java rename to src/main/java/engine/package-info.java diff --git a/src/engine/sound/SoundBuffer.java b/src/main/java/engine/sound/SoundBuffer.java similarity index 100% rename from src/engine/sound/SoundBuffer.java rename to src/main/java/engine/sound/SoundBuffer.java diff --git a/src/engine/sound/SoundListener.java b/src/main/java/engine/sound/SoundListener.java similarity index 100% rename from src/engine/sound/SoundListener.java rename to src/main/java/engine/sound/SoundListener.java diff --git a/src/engine/sound/SoundManager.java b/src/main/java/engine/sound/SoundManager.java similarity index 100% rename from src/engine/sound/SoundManager.java rename to src/main/java/engine/sound/SoundManager.java diff --git a/src/engine/sound/SoundSource.java b/src/main/java/engine/sound/SoundSource.java similarity index 100% rename from src/engine/sound/SoundSource.java rename to src/main/java/engine/sound/SoundSource.java diff --git a/src/engine/utils/BufferUtilsEngine.java b/src/main/java/engine/utils/BufferUtilsEngine.java similarity index 100% rename from src/engine/utils/BufferUtilsEngine.java rename to src/main/java/engine/utils/BufferUtilsEngine.java diff --git a/src/engine/utils/FileUtils.java b/src/main/java/engine/utils/FileUtils.java similarity index 88% rename from src/engine/utils/FileUtils.java rename to src/main/java/engine/utils/FileUtils.java index 13d8017..fb1491d 100644 --- a/src/engine/utils/FileUtils.java +++ b/src/main/java/engine/utils/FileUtils.java @@ -2,6 +2,8 @@ package engine.utils; import org.lwjgl.BufferUtils; +import engine.Engine; + import java.io.*; import java.nio.ByteBuffer; import java.nio.channels.SeekableByteChannel; @@ -18,7 +20,7 @@ public class FileUtils { public static String loadAsString(String file){ StringBuilder result = new StringBuilder(); try { - BufferedReader reader = new BufferedReader(new FileReader(file)); + BufferedReader reader = new BufferedReader(new InputStreamReader(Engine.class.getResourceAsStream(file))); String buffer = ""; while ((buffer = reader.readLine()) != null) { result.append(buffer).append("\n"); diff --git a/src/engine/utils/ShaderUtils.java b/src/main/java/engine/utils/ShaderUtils.java similarity index 100% rename from src/engine/utils/ShaderUtils.java rename to src/main/java/engine/utils/ShaderUtils.java diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/main/java/gameplay/Characters/Blue/BlueBaseFrames.java similarity index 100% rename from src/gameplay/Characters/Blue/BlueBaseFrames.java rename to src/main/java/gameplay/Characters/Blue/BlueBaseFrames.java diff --git a/src/gameplay/Characters/Blue/BlueMisc.java b/src/main/java/gameplay/Characters/Blue/BlueMisc.java similarity index 100% rename from src/gameplay/Characters/Blue/BlueMisc.java rename to src/main/java/gameplay/Characters/Blue/BlueMisc.java diff --git a/src/gameplay/Characters/Blue/BlueNormals.java b/src/main/java/gameplay/Characters/Blue/BlueNormals.java similarity index 100% rename from src/gameplay/Characters/Blue/BlueNormals.java rename to src/main/java/gameplay/Characters/Blue/BlueNormals.java diff --git a/src/gameplay/Characters/Blue/BlueSpecials.java b/src/main/java/gameplay/Characters/Blue/BlueSpecials.java similarity index 100% rename from src/gameplay/Characters/Blue/BlueSpecials.java rename to src/main/java/gameplay/Characters/Blue/BlueSpecials.java diff --git a/src/gameplay/Characters/Blue/CharacterBlue.java b/src/main/java/gameplay/Characters/Blue/CharacterBlue.java similarity index 100% rename from src/gameplay/Characters/Blue/CharacterBlue.java rename to src/main/java/gameplay/Characters/Blue/CharacterBlue.java diff --git a/src/gameplay/actions/Action.java b/src/main/java/gameplay/actions/Action.java similarity index 100% rename from src/gameplay/actions/Action.java rename to src/main/java/gameplay/actions/Action.java diff --git a/src/gameplay/actions/Attack.java b/src/main/java/gameplay/actions/Attack.java similarity index 100% rename from src/gameplay/actions/Attack.java rename to src/main/java/gameplay/actions/Attack.java diff --git a/src/gameplay/actions/Dash.java b/src/main/java/gameplay/actions/Dash.java similarity index 100% rename from src/gameplay/actions/Dash.java rename to src/main/java/gameplay/actions/Dash.java diff --git a/src/gameplay/actions/Jump.java b/src/main/java/gameplay/actions/Jump.java similarity index 100% rename from src/gameplay/actions/Jump.java rename to src/main/java/gameplay/actions/Jump.java diff --git a/src/gameplay/actions/Throw.java b/src/main/java/gameplay/actions/Throw.java similarity index 100% rename from src/gameplay/actions/Throw.java rename to src/main/java/gameplay/actions/Throw.java diff --git a/src/gameplay/actions/ThrowPart.java b/src/main/java/gameplay/actions/ThrowPart.java similarity index 100% rename from src/gameplay/actions/ThrowPart.java rename to src/main/java/gameplay/actions/ThrowPart.java diff --git a/src/gameplay/actions/attackPart.java b/src/main/java/gameplay/actions/attackPart.java similarity index 100% rename from src/gameplay/actions/attackPart.java rename to src/main/java/gameplay/actions/attackPart.java diff --git a/src/gameplay/entities/Character.java b/src/main/java/gameplay/entities/Character.java similarity index 100% rename from src/gameplay/entities/Character.java rename to src/main/java/gameplay/entities/Character.java diff --git a/src/gameplay/entities/Entity.java b/src/main/java/gameplay/entities/Entity.java similarity index 100% rename from src/gameplay/entities/Entity.java rename to src/main/java/gameplay/entities/Entity.java diff --git a/src/gameplay/entities/Projectile.java b/src/main/java/gameplay/entities/Projectile.java similarity index 100% rename from src/gameplay/entities/Projectile.java rename to src/main/java/gameplay/entities/Projectile.java diff --git a/src/gameplay/entities/Status.java b/src/main/java/gameplay/entities/Status.java similarity index 100% rename from src/gameplay/entities/Status.java rename to src/main/java/gameplay/entities/Status.java diff --git a/src/gameplay/frames/Frame.java b/src/main/java/gameplay/frames/Frame.java similarity index 100% rename from src/gameplay/frames/Frame.java rename to src/main/java/gameplay/frames/Frame.java diff --git a/src/gameplay/hitboxes/Active_HitBox.java b/src/main/java/gameplay/hitboxes/Active_HitBox.java similarity index 100% rename from src/gameplay/hitboxes/Active_HitBox.java rename to src/main/java/gameplay/hitboxes/Active_HitBox.java diff --git a/src/gameplay/hitboxes/Active_throw_Hitbox.java b/src/main/java/gameplay/hitboxes/Active_throw_Hitbox.java similarity index 100% rename from src/gameplay/hitboxes/Active_throw_Hitbox.java rename to src/main/java/gameplay/hitboxes/Active_throw_Hitbox.java diff --git a/src/gameplay/hitboxes/HitBox.java b/src/main/java/gameplay/hitboxes/HitBox.java similarity index 100% rename from src/gameplay/hitboxes/HitBox.java rename to src/main/java/gameplay/hitboxes/HitBox.java diff --git a/src/gameplay/hitboxes/Passive_HitBox.java b/src/main/java/gameplay/hitboxes/Passive_HitBox.java similarity index 100% rename from src/gameplay/hitboxes/Passive_HitBox.java rename to src/main/java/gameplay/hitboxes/Passive_HitBox.java diff --git a/src/gameplay/hitboxes/Passive_throw_HitBox.java b/src/main/java/gameplay/hitboxes/Passive_throw_HitBox.java similarity index 100% rename from src/gameplay/hitboxes/Passive_throw_HitBox.java rename to src/main/java/gameplay/hitboxes/Passive_throw_HitBox.java diff --git a/src/gameplay/hitboxes/Push_HitBox.java b/src/main/java/gameplay/hitboxes/Push_HitBox.java similarity index 100% rename from src/gameplay/hitboxes/Push_HitBox.java rename to src/main/java/gameplay/hitboxes/Push_HitBox.java diff --git a/src/gameplay/input/ButtonIG.java b/src/main/java/gameplay/input/ButtonIG.java similarity index 100% rename from src/gameplay/input/ButtonIG.java rename to src/main/java/gameplay/input/ButtonIG.java diff --git a/src/gameplay/input/InputBuffer.java b/src/main/java/gameplay/input/InputBuffer.java similarity index 100% rename from src/gameplay/input/InputBuffer.java rename to src/main/java/gameplay/input/InputBuffer.java diff --git a/src/gameplay/input/Inputs.java b/src/main/java/gameplay/input/Inputs.java similarity index 100% rename from src/gameplay/input/Inputs.java rename to src/main/java/gameplay/input/Inputs.java diff --git a/src/gameplay/match/match.java b/src/main/java/gameplay/match/match.java similarity index 97% rename from src/gameplay/match/match.java rename to src/main/java/gameplay/match/match.java index cd63df7..89e131a 100644 --- a/src/gameplay/match/match.java +++ b/src/main/java/gameplay/match/match.java @@ -204,10 +204,10 @@ public class match { String pathToBG = ""; switch (stage) { case "arena1": - pathToBG = "textures/arena1.png"; + pathToBG = "/textures/arena1.png"; break; default: - pathToBG = "textures/arena1.png"; + pathToBG = "/textures/arena1.png"; } ObjectGl background = new ObjectGl(0f,1f,1f,2.5f, pathToBG, null); @@ -221,22 +221,22 @@ public class match { switch (character1) { case "blue": p1 = CharacterBlue.generateCharBlue(); - pathp1 = "textures/Sprite_sans_grille_9comp.png"; + pathp1 = "/textures/Sprite_sans_grille_9comp.png"; break; default: p1 = CharacterBlue.generateCharBlue(); - pathp1 = "textures/Sprite_sans_grille_9comp.png"; + pathp1 = "/textures/Sprite_sans_grille_9comp.png"; break; } switch (character2) { case "blue": p2 = CharacterBlue.generateCharBlue(); - pathp2 = "textures/Sprite_sans_grille_9comp.png"; + pathp2 = "/textures/Sprite_sans_grille_9comp.png"; break; default: p2 = CharacterBlue.generateCharBlue(); - pathp2 = "textures/Sprite_sans_grille_9comp.png"; + pathp2 = "/textures/Sprite_sans_grille_9comp.png"; break; } @@ -280,23 +280,23 @@ public class match { engine.add_uiElement(coordP2); // Barre de vie healthBarP1Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p1.getCurrentHP(), p1.getMaxHP(), false); - healthBarP1Obj.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl"); + healthBarP1Obj.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl"); healthBarP1Obj.setUseHeight(true); healthBarP1Obj.useTime = true; healthBarP1 = new UIElement(healthBarP1Obj, 0.0138f, 0.980f, engine); healthBarP2Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p2.getCurrentHP(), p2.getMaxHP(), true); - healthBarP2Obj.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl"); + healthBarP2Obj.setShader("/shaders/StylishShaders/BasicNoTexVert.glsl", "/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl"); healthBarP2Obj.setUseHeight(true); healthBarP2Obj.useTime = true; healthBarP2 = new UIElement(healthBarP2Obj, 0.563f, 0.980f, engine); engine.add_uiElement(healthBarP1); engine.add_uiElement(healthBarP2); // Habillage barre de vie - ObjectGl healthBarP1Hab = new ObjectGl(81f, 1f, 1f, 1f, "textures/health_bar.png", null); + ObjectGl healthBarP1Hab = new ObjectGl(81f, 1f, 1f, 1f, "/textures/health_bar.png", null); healthBarP1Hab.setTextureWrap(0,0, 883, 158); UIElement healthBarP1HabUI = new UIElement(healthBarP1Hab, 0.005f, 0.995f, engine); engine.add_uiElement(healthBarP1HabUI); - ObjectGl healthBarP2Hab = new ObjectGl(81f, 1f, 1f, 1f, "textures/health_bar.png", null); + ObjectGl healthBarP2Hab = new ObjectGl(81f, 1f, 1f, 1f, "/textures/health_bar.png", null); healthBarP2Hab.setTextureWrap(0,0, 883, 158); healthBarP2Hab.flipTextureWrapH(); UIElement healthBarP2HabUI = new UIElement(healthBarP2Hab, 0.555f, 0.995f, engine); diff --git a/src/gameplay/match/sprite_zorder.txt b/src/main/java/gameplay/match/sprite_zorder.txt similarity index 100% rename from src/gameplay/match/sprite_zorder.txt rename to src/main/java/gameplay/match/sprite_zorder.txt diff --git a/src/launcher/Launcher.java b/src/main/java/launcher/Launcher.java similarity index 100% rename from src/launcher/Launcher.java rename to src/main/java/launcher/Launcher.java diff --git a/src/launcher/Settings.java b/src/main/java/launcher/Settings.java similarity index 100% rename from src/launcher/Settings.java rename to src/main/java/launcher/Settings.java diff --git a/src/launcher/charfaces/blue.png b/src/main/resources/launcher/charfaces/blue.png similarity index 100% rename from src/launcher/charfaces/blue.png rename to src/main/resources/launcher/charfaces/blue.png diff --git a/src/launcher/default.png b/src/main/resources/launcher/charfaces/default.png similarity index 100% rename from src/launcher/default.png rename to src/main/resources/launcher/charfaces/default.png diff --git a/src/launcher/launcher.fxml b/src/main/resources/launcher/launcher.fxml similarity index 96% rename from src/launcher/launcher.fxml rename to src/main/resources/launcher/launcher.fxml index bddce39..6a35ee7 100644 --- a/src/launcher/launcher.fxml +++ b/src/main/resources/launcher/launcher.fxml @@ -78,7 +78,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/src/launcher/logo.png b/src/main/resources/launcher/logo.png similarity index 100% rename from src/launcher/logo.png rename to src/main/resources/launcher/logo.png diff --git a/src/launcher/style.css b/src/main/resources/launcher/style.css similarity index 100% rename from src/launcher/style.css rename to src/main/resources/launcher/style.css diff --git a/shaders/ObjectGl/frag.glsl b/src/main/resources/shaders/ObjectGl/frag.glsl similarity index 100% rename from shaders/ObjectGl/frag.glsl rename to src/main/resources/shaders/ObjectGl/frag.glsl diff --git a/shaders/ObjectGl/vert.glsl b/src/main/resources/shaders/ObjectGl/vert.glsl similarity index 100% rename from shaders/ObjectGl/vert.glsl rename to src/main/resources/shaders/ObjectGl/vert.glsl diff --git a/shaders/ObjectGlColor/frag.glsl b/src/main/resources/shaders/ObjectGlColor/frag.glsl similarity index 100% rename from shaders/ObjectGlColor/frag.glsl rename to src/main/resources/shaders/ObjectGlColor/frag.glsl diff --git a/shaders/ObjectGlColor/vert.glsl b/src/main/resources/shaders/ObjectGlColor/vert.glsl similarity index 100% rename from shaders/ObjectGlColor/vert.glsl rename to src/main/resources/shaders/ObjectGlColor/vert.glsl diff --git a/shaders/ObjectGlTex/frag.glsl b/src/main/resources/shaders/ObjectGlTex/frag.glsl similarity index 100% rename from shaders/ObjectGlTex/frag.glsl rename to src/main/resources/shaders/ObjectGlTex/frag.glsl diff --git a/shaders/ObjectGlTex/vert.glsl b/src/main/resources/shaders/ObjectGlTex/vert.glsl similarity index 100% rename from shaders/ObjectGlTex/vert.glsl rename to src/main/resources/shaders/ObjectGlTex/vert.glsl diff --git a/shaders/ObjectGlTexColor/frag.glsl b/src/main/resources/shaders/ObjectGlTexColor/frag.glsl similarity index 100% rename from shaders/ObjectGlTexColor/frag.glsl rename to src/main/resources/shaders/ObjectGlTexColor/frag.glsl diff --git a/shaders/ObjectGlTexColor/vert.glsl b/src/main/resources/shaders/ObjectGlTexColor/vert.glsl similarity index 100% rename from shaders/ObjectGlTexColor/vert.glsl rename to src/main/resources/shaders/ObjectGlTexColor/vert.glsl diff --git a/shaders/StylishShaders/BasicNoTexVert.glsl b/src/main/resources/shaders/StylishShaders/BasicNoTexVert.glsl similarity index 100% rename from shaders/StylishShaders/BasicNoTexVert.glsl rename to src/main/resources/shaders/StylishShaders/BasicNoTexVert.glsl diff --git a/shaders/StylishShaders/BasicVert.glsl b/src/main/resources/shaders/StylishShaders/BasicVert.glsl similarity index 100% rename from shaders/StylishShaders/BasicVert.glsl rename to src/main/resources/shaders/StylishShaders/BasicVert.glsl diff --git a/shaders/StylishShaders/FlashFrag.glsl b/src/main/resources/shaders/StylishShaders/FlashFrag.glsl similarity index 100% rename from shaders/StylishShaders/FlashFrag.glsl rename to src/main/resources/shaders/StylishShaders/FlashFrag.glsl diff --git a/shaders/StylishShaders/HitboxFrag.glsl b/src/main/resources/shaders/StylishShaders/HitboxFrag.glsl similarity index 100% rename from shaders/StylishShaders/HitboxFrag.glsl rename to src/main/resources/shaders/StylishShaders/HitboxFrag.glsl diff --git a/shaders/StylishShaders/HorizontalProgressBarFrag.glsl b/src/main/resources/shaders/StylishShaders/HorizontalProgressBarFrag.glsl similarity index 100% rename from shaders/StylishShaders/HorizontalProgressBarFrag.glsl rename to src/main/resources/shaders/StylishShaders/HorizontalProgressBarFrag.glsl diff --git a/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl b/src/main/resources/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl similarity index 100% rename from shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl rename to src/main/resources/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl diff --git a/shaders/StylishShaders/TextFrag.glsl b/src/main/resources/shaders/StylishShaders/TextFrag.glsl similarity index 100% rename from shaders/StylishShaders/TextFrag.glsl rename to src/main/resources/shaders/StylishShaders/TextFrag.glsl diff --git a/shaders/StylishShaders/WavyTextVert.glsl b/src/main/resources/shaders/StylishShaders/WavyTextVert.glsl similarity index 100% rename from shaders/StylishShaders/WavyTextVert.glsl rename to src/main/resources/shaders/StylishShaders/WavyTextVert.glsl diff --git a/sound/jump.ogg b/src/main/resources/sound/jump.ogg similarity index 100% rename from sound/jump.ogg rename to src/main/resources/sound/jump.ogg diff --git a/textures/Sprite_9comp.png b/src/main/resources/textures/Sprite_9comp.png similarity index 100% rename from textures/Sprite_9comp.png rename to src/main/resources/textures/Sprite_9comp.png diff --git a/textures/Sprite_sans_grille_9comp.png b/src/main/resources/textures/Sprite_sans_grille_9comp.png similarity index 100% rename from textures/Sprite_sans_grille_9comp.png rename to src/main/resources/textures/Sprite_sans_grille_9comp.png diff --git a/textures/arena1.png b/src/main/resources/textures/arena1.png similarity index 100% rename from textures/arena1.png rename to src/main/resources/textures/arena1.png diff --git a/textures/awesomeface.png b/src/main/resources/textures/awesomeface.png similarity index 100% rename from textures/awesomeface.png rename to src/main/resources/textures/awesomeface.png diff --git a/textures/background_beach.png b/src/main/resources/textures/background_beach.png similarity index 100% rename from textures/background_beach.png rename to src/main/resources/textures/background_beach.png diff --git a/textures/container.jpg b/src/main/resources/textures/container.jpg similarity index 100% rename from textures/container.jpg rename to src/main/resources/textures/container.jpg diff --git a/textures/dejavu10x10_gs_tc.png b/src/main/resources/textures/dejavu10x10_gs_tc.png similarity index 100% rename from textures/dejavu10x10_gs_tc.png rename to src/main/resources/textures/dejavu10x10_gs_tc.png diff --git a/textures/health_bar.png b/src/main/resources/textures/health_bar.png similarity index 100% rename from textures/health_bar.png rename to src/main/resources/textures/health_bar.png diff --git a/textures/health_bar_9compress.png b/src/main/resources/textures/health_bar_9compress.png similarity index 100% rename from textures/health_bar_9compress.png rename to src/main/resources/textures/health_bar_9compress.png diff --git a/textures/keyboard_pad_glyphs/Controller_Disconnected.png b/src/main/resources/textures/keyboard_pad_glyphs/Controller_Disconnected.png similarity index 100% rename from textures/keyboard_pad_glyphs/Controller_Disconnected.png rename to src/main/resources/textures/keyboard_pad_glyphs/Controller_Disconnected.png diff --git a/textures/keyboard_pad_glyphs/Readme.txt b/src/main/resources/textures/keyboard_pad_glyphs/Readme.txt similarity index 100% rename from textures/keyboard_pad_glyphs/Readme.txt rename to src/main/resources/textures/keyboard_pad_glyphs/Readme.txt diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Cross.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Cross.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Cross.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Cross.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Diagonal.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Diagonal.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Diagonal.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Diagonal.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Full_Circle.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Full_Circle.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Full_Circle.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Full_Circle.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Half_Circle.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Half_Circle.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Half_Circle.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Half_Circle.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Horizontal.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Horizontal.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Horizontal.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Horizontal.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Quarter_Circle.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Quarter_Circle.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Quarter_Circle.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Quarter_Circle.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Sides.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Sides.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Sides.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Sides.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Straight.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Straight.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Straight.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Straight.png diff --git a/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Vertical.png b/src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Vertical.png similarity index 100% rename from textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Vertical.png rename to src/main/resources/textures/keyboard_pad_glyphs/arrows/Directional_Arrow_Vertical.png diff --git a/textures/keyboard_pad_glyphs/keyboard/0_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/0_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/0_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/0_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/10_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/10_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/10_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/10_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/11_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/11_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/11_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/11_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/12_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/12_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/12_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/12_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/1_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/1_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/1_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/1_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/2_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/2_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/2_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/2_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/3_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/3_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/3_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/3_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/4_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/4_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/4_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/4_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/5_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/5_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/5_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/5_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/6_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/6_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/6_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/6_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/7_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/7_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/7_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/7_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/8_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/8_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/8_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/8_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/9_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/9_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/9_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/9_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/A_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/A_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/A_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/A_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Alt_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Alt_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Alt_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Alt_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Arrow_Down_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Down_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Arrow_Down_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Down_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Arrow_Left_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Left_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Arrow_Left_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Left_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Arrow_Right_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Right_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Arrow_Right_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Right_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Arrow_Up_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Up_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Arrow_Up_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Arrow_Up_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Asterisk_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Asterisk_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Asterisk_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Asterisk_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/B_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/B_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/B_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/B_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Backspace_Alt_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Backspace_Alt_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Backspace_Alt_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Backspace_Alt_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Backspace_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Backspace_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Backspace_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Backspace_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Bracket_Left_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Bracket_Left_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Bracket_Left_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Bracket_Left_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Bracket_Right_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Bracket_Right_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Bracket_Right_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Bracket_Right_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/C_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/C_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/C_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/C_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Caps_Lock_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Caps_Lock_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Caps_Lock_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Caps_Lock_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Command_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Command_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Command_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Command_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Ctrl_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Ctrl_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Ctrl_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Ctrl_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/D_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/D_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/D_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/D_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Del_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Del_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Del_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Del_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/E_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/E_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/E_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/E_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/End_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/End_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/End_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/End_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Enter_Alt_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Alt_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Enter_Alt_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Alt_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Enter_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Enter_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Enter_Tall_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Tall_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Enter_Tall_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Enter_Tall_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Esc_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Esc_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Esc_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Esc_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F10_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F10_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F10_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F10_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F11_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F11_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F11_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F11_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F12_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F12_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F12_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F12_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F1_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F1_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F1_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F1_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F2_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F2_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F2_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F2_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F3_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F3_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F3_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F3_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F4_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F4_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F4_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F4_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F5_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F5_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F5_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F5_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F6_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F6_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F6_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F6_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F7_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F7_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F7_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F7_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F8_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F8_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F8_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F8_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F9_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F9_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F9_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F9_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/F_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/F_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/F_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/F_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/G_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/G_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/G_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/G_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/H_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/H_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/H_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/H_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Home_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Home_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Home_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Home_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/I_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/I_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/I_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/I_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Insert_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Insert_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Insert_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Insert_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/J_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/J_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/J_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/J_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/K_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/K_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/K_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/K_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/L_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/L_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/L_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/L_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/M_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/M_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/M_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/M_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mark_Left_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mark_Left_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mark_Left_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mark_Left_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mark_Right_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mark_Right_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mark_Right_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mark_Right_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Minus_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Minus_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Minus_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Minus_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mouse_Left_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Left_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mouse_Left_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Left_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mouse_Middle_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Middle_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mouse_Middle_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Middle_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mouse_Right_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Right_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mouse_Right_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Right_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Mouse_Simple_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Simple_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Mouse_Simple_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Mouse_Simple_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/N_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/N_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/N_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/N_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Num_Lock_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Num_Lock_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Num_Lock_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Num_Lock_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/O_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/O_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/O_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/O_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/P_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/P_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/P_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/P_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Page_Down_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Page_Down_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Page_Down_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Page_Down_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Page_Up_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Page_Up_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Page_Up_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Page_Up_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Plus_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Plus_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Plus_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Plus_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Plus_Tall_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Plus_Tall_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Plus_Tall_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Plus_Tall_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Print_Screen_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Print_Screen_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Print_Screen_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Print_Screen_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Q_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Q_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Q_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Q_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Question_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Question_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Question_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Question_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Quote_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Quote_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Quote_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Quote_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/R_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/R_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/R_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/R_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/S_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/S_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/S_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/S_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Semicolon_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Semicolon_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Semicolon_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Semicolon_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Shift_Alt_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Shift_Alt_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Shift_Alt_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Shift_Alt_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Shift_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Shift_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Shift_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Shift_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Slash_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Slash_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Slash_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Slash_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Space_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Space_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Space_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Space_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/T_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/T_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/T_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/T_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Tab_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Tab_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Tab_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Tab_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Tilda_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Tilda_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Tilda_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Tilda_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/U_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/U_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/U_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/U_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/V_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/V_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/V_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/V_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/W_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/W_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/W_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/W_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Win_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Win_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Win_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Win_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/X_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/X_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/X_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/X_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Y_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Y_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Y_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Y_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/keyboard/Z_Key_Dark.png b/src/main/resources/textures/keyboard_pad_glyphs/keyboard/Z_Key_Dark.png similarity index 100% rename from textures/keyboard_pad_glyphs/keyboard/Z_Key_Dark.png rename to src/main/resources/textures/keyboard_pad_glyphs/keyboard/Z_Key_Dark.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_A.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_A.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_A.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_A.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_B.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_B.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_B.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_B.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram_Simple.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram_Simple.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram_Simple.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Diagram_Simple.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Down.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Left.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Right.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Dpad_Up.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_LB.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_LB.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_LB.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_LB.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_LT.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_LT.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_LT.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_LT.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick_Click.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick_Click.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick_Click.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Left_Stick_Click.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Menu.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Menu.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Menu.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Menu.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_RB.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_RB.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_RB.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_RB.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_RT.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_RT.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_RT.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_RT.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick_Click.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick_Click.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick_Click.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Right_Stick_Click.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Windows.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Windows.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Windows.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Windows.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_X.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_X.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_X.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_X.png diff --git a/textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png b/src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png similarity index 100% rename from textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png rename to src/main/resources/textures/keyboard_pad_glyphs/xbox/XboxOne_Y.png diff --git a/textures/shadow.png b/src/main/resources/textures/shadow.png similarity index 100% rename from textures/shadow.png rename to src/main/resources/textures/shadow.png diff --git a/textures/sprite_action.txt b/src/main/resources/textures/sprite_action.txt similarity index 100% rename from textures/sprite_action.txt rename to src/main/resources/textures/sprite_action.txt diff --git a/textures/zangief_sprite.png b/src/main/resources/textures/zangief_sprite.png similarity index 100% rename from textures/zangief_sprite.png rename to src/main/resources/textures/zangief_sprite.png