GameDevArea/Global-Gam-Jam-2017
Archived
1
0
Fork 0
Code Releases 1 Activity

Refactor

Browse source
This commit is contained in:
MrDev023 2017-01-21 00:20:29 +01:00
parent 4ae8175fda
commit 94a2840057
3 changed files with 111 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

269
.idea/workspace.xml
View file

@ -2,13 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="00f293cb-c755-478c-9b6f-422f827454e0" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/globalgamejam/world/MainWorld.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java" afterPath="$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" afterPath="$PROJECT_DIR$/src/globalgamejam/game/MainGame.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUI.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" afterPath="$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" afterPath="$PROJECT_DIR$/src/globalgamejam/render/Texture.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -27,15 +22,27 @@
<file leaf-file-name="GUILabel.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="74" column="60" lean-forward="false" selection-start-line="74" selection-start-column="60" selection-end-line="74" selection-end-column="60" />
<state relative-caret-position="-2663">
<caret line="48" column="25" lean-forward="false" selection-start-line="48" selection-start-column="25" selection-end-line="48" selection-end-column="25" />
<folding>
<element signature="e#3387#3388#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3635#3636#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3828#3829#0" expanded="true" />
<element signature="e#3847#3848#0" expanded="true" />
<element signature="e#4296#4297#0" expanded="true" />
<element signature="e#4314#4315#0" expanded="true" />
<element signature="e#4773#4774#0" expanded="true" />
<element signature="e#4788#4789#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4964#4965#0" expanded="true" />
<element signature="e#5114#5115#0" expanded="true" />
<element signature="e#5129#5130#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5661#5662#0" expanded="true" />
<element signature="e#5693#5694#0" expanded="true" />
<element signature="e#5803#5804#0" expanded="true" />
<element signature="e#5837#5838#0" expanded="true" />
</folding>
@ -43,11 +50,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="Texture.java" pinned="false" current-in-tab="false">
<file leaf-file-name="TestTile.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/TestTile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="36" lean-forward="false" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Texture.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="30" column="8" lean-forward="true" selection-start-line="30" selection-start-column="8" selection-end-line="37" selection-end-column="36" />
<state relative-caret-position="34">
<caret line="22" column="4" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -58,8 +75,8 @@
<file leaf-file-name="Tile.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<state relative-caret-position="237">
<caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -74,10 +91,10 @@
<caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#673#674#0" expanded="true" />
<element signature="e#694#695#0" expanded="true" />
<element signature="e#734#735#0" expanded="true" />
<element signature="e#760#761#0" expanded="true" />
<element signature="e#669#670#0" expanded="true" />
<element signature="e#690#691#0" expanded="true" />
<element signature="e#730#731#0" expanded="true" />
<element signature="e#756#757#0" expanded="true" />
</folding>
</state>
</provider>
@ -99,17 +116,17 @@
</provider>
</entry>
</file>
<file leaf-file-name="MainInterfaces.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java">
<file leaf-file-name="MainInterfaces.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<state relative-caret-position="221">
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1154#1155#0" expanded="true" />
<element signature="e#1197#1198#0" expanded="true" />
<element signature="e#1225#1226#0" expanded="true" />
<element signature="e#1253#1254#0" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1193#1194#0" expanded="true" />
<element signature="e#1221#1222#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
</folding>
</state>
</provider>
@ -118,7 +135,7 @@
<file leaf-file-name="GUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<state relative-caret-position="316">
<caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding>
<element signature="e#507#508#0" expanded="true" />
@ -136,16 +153,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="Input.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/input/Input.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-137">
<caret line="130" column="26" lean-forward="false" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IActionGUI.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/IActionGUI.java">
<provider selected="true" editor-type-id="text-editor">
@ -307,6 +314,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="globalgamejam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tiles" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
@ -351,32 +380,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="globalgamejam" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="interfaces" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Global-Gam-Jam-2017" />
@ -646,7 +649,7 @@
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1000" extended-state="6" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -663,7 +666,7 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -694,21 +697,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="88" lean-forward="false" selection-start-line="18" selection-start-column="88" selection-end-line="18" selection-end-column="88" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -733,7 +721,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -751,9 +738,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="21" column="59" lean-forward="false" selection-start-line="21" selection-start-column="59" selection-end-line="21" selection-end-column="59" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -761,7 +745,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="6" lean-forward="false" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
@ -777,21 +760,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="18" column="88" lean-forward="false" selection-start-line="18" selection-start-column="88" selection-end-line="18" selection-end-column="88" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -799,7 +767,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="14" column="3" lean-forward="false" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
<folding />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -812,7 +782,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="3" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
@ -834,7 +803,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="3" lean-forward="false" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
@ -886,21 +854,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731">
<caret line="47" column="47" lean-forward="false" selection-start-line="47" selection-start-column="47" selection-end-line="47" selection-end-column="47" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1625#1626#0" expanded="false" />
<element signature="e#1653#1654#0" expanded="false" />
<element signature="e#1678#1679#0" expanded="false" />
<element signature="e#1700#1701#0" expanded="false" />
<element signature="e#1746#1747#0" expanded="false" />
<element signature="e#1794#1795#0" expanded="false" />
<element signature="e#1958#1959#0" expanded="false" />
<element signature="e#2016#2017#0" expanded="false" />
<element signature="e#2066#2067#0" expanded="false" />
<element signature="e#2140#2141#0" expanded="false" />
<element signature="e#2587#2588#0" expanded="false" />
<element signature="e#2644#2645#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -940,7 +893,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
@ -948,7 +900,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-459">
<caret line="67" column="28" lean-forward="true" selection-start-line="67" selection-start-column="28" selection-end-line="67" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
@ -956,10 +907,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="28" column="26" lean-forward="false" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
<folding>
<element signature="e#465#466#0" expanded="true" />
<element signature="e#495#496#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -967,7 +914,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="86" column="22" lean-forward="true" selection-start-line="86" selection-start-column="22" selection-end-line="86" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
@ -975,18 +921,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="14" lean-forward="false" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/Image.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-732">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/Image.java" />
<entry file="file://$PROJECT_DIR$/src/globalgamejam/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-340">
@ -1001,7 +939,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="31" column="56" lean-forward="false" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
@ -1031,8 +968,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/tiles/Tile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="67" column="0" lean-forward="false" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<state relative-caret-position="237">
<caret line="27" column="47" lean-forward="false" selection-start-line="27" selection-start-column="47" selection-end-line="27" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -1041,7 +978,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<state relative-caret-position="316">
<caret line="20" column="38" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding>
<element signature="e#507#508#0" expanded="true" />
@ -1058,27 +995,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="30" column="8" lean-forward="true" selection-start-line="30" selection-start-column="8" selection-end-line="37" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/GUILabel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="74" column="60" lean-forward="false" selection-start-line="74" selection-start-column="60" selection-end-line="74" selection-end-column="60" />
<state relative-caret-position="-2663">
<caret line="48" column="25" lean-forward="false" selection-start-line="48" selection-start-column="25" selection-end-line="48" selection-end-column="25" />
<folding>
<element signature="e#3387#3388#0" expanded="true" />
<element signature="e#3402#3403#0" expanded="true" />
<element signature="e#3635#3636#0" expanded="true" />
<element signature="e#3688#3689#0" expanded="true" />
<element signature="e#3828#3829#0" expanded="true" />
<element signature="e#3847#3848#0" expanded="true" />
<element signature="e#4296#4297#0" expanded="true" />
<element signature="e#4314#4315#0" expanded="true" />
<element signature="e#4773#4774#0" expanded="true" />
<element signature="e#4788#4789#0" expanded="true" />
<element signature="e#4944#4945#0" expanded="true" />
<element signature="e#4964#4965#0" expanded="true" />
<element signature="e#5114#5115#0" expanded="true" />
<element signature="e#5129#5130#0" expanded="true" />
<element signature="e#5285#5286#0" expanded="true" />
<element signature="e#5305#5306#0" expanded="true" />
<element signature="e#5661#5662#0" expanded="true" />
<element signature="e#5693#5694#0" expanded="true" />
<element signature="e#5803#5804#0" expanded="true" />
<element signature="e#5837#5838#0" expanded="true" />
</folding>
@ -1091,10 +1030,10 @@
<caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#673#674#0" expanded="true" />
<element signature="e#694#695#0" expanded="true" />
<element signature="e#734#735#0" expanded="true" />
<element signature="e#760#761#0" expanded="true" />
<element signature="e#669#670#0" expanded="true" />
<element signature="e#690#691#0" expanded="true" />
<element signature="e#730#731#0" expanded="true" />
<element signature="e#756#757#0" expanded="true" />
</folding>
</state>
</provider>
@ -1113,16 +1052,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/gui/interfaces/MainInterfaces.java">
<entry file="file://$PROJECT_DIR$/src/globalgamejam/interfaces/MainInterfaces.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="36" column="25" lean-forward="false" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
<state relative-caret-position="221">
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1193#1194#0" expanded="true" />
<element signature="e#1221#1222#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/globalgamejam/render/Texture.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="22" column="4" lean-forward="true" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1154#1155#0" expanded="true" />
<element signature="e#1197#1198#0" expanded="true" />
<element signature="e#1225#1226#0" expanded="true" />
<element signature="e#1253#1254#0" expanded="true" />
</folding>
</state>
</provider>

2
src/globalgamejam/game/MainGame.java
View file

@ -1,6 +1,6 @@
package globalgamejam.game;
import globalgamejam.gui.interfaces.MainInterfaces;
import globalgamejam.interfaces.MainInterfaces;
import globalgamejam.world.MainWorld;

2
src/globalgamejam/gui/interfaces/MainInterfaces.java → src/globalgamejam/interfaces/MainInterfaces.java
View file

@ -1,4 +1,4 @@
package globalgamejam.gui.interfaces;
package globalgamejam.interfaces;
import globalgamejam.Main;
import globalgamejam.game.MainGame;