diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f868ee25694015522ddafff4aa851a0c88769fc6 Binary files /dev/null and b/.DS_Store differ diff --git a/.idea/.gitignore b/.idea/.gitignore index 93991d9ad86cc684e8f62e30a2e077b79784a687..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,8 +1,3 @@ # Default ignored files /shelf/ /workspace.xml -# Datasource local storage ignored files -/../../../../../../../../../:\Users\14159\Desktop\study\oosd\project2\yiya-project-2\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000000000000000000000000000000000..e5199ee79ccef033b3d3412968c960ebf7ffe811 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +bagel \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..5ed7d1ee1d47a9d2bb314a87f99538d402e982e0 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <annotationProcessing> + <profile name="Maven default annotation processors profile" enabled="true"> + <sourceOutputDir name="target/generated-sources/annotations" /> + <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> + <outputRelativeToContentRoot value="true" /> + <module name="bagel" /> + </profile> + </annotationProcessing> + <bytecodeTargetLevel> + <module name="bagel" target="14" /> + </bytecodeTargetLevel> + </component> +</project> \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c4dc07abe12acf7923c431042d41a38bc07ff33 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding"> + <file url="file://$PROJECT_DIR$/res/IO/environment.csv" charset="GBK" /> + <file url="file://$PROJECT_DIR$/test/test1/environment.csv" charset="GBK" /> + <file url="file://$PROJECT_DIR$/test/test2/environment.csv" charset="GBK" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..712ab9d985c20018a0c97b93d2148ac1ffe588a5 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RemoteRepositoriesConfiguration"> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Central Repository" /> + <option name="url" value="https://repo.maven.apache.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Maven Central repository" /> + <option name="url" value="https://repo1.maven.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="jboss.community" /> + <option name="name" value="JBoss Community repository" /> + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> + </remote-repository> + </component> +</project> \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml b/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..8a3817e8e03ccad221cb388d67521c24d3f93203 --- /dev/null +++ b/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: io.github.eleanor-em:bagel:1.9.3"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..b41e0a0e6d45226876b26c951f89f0a888668616 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..04a33d893ffa7c2f813e11d6127a98947eb61143 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-assimp:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..a79e8a179bb0c4eec5aae8c94191b326f9a84871 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-assimp:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..48aa8aa34959abd0874a96c96d6e6f9d65c33c91 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-glfw:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..d29558274d1751e28b199599bf85d1ddfa18b9ba --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-glfw:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..6ecec7b09589049b3d76151dfe194a55f9fff9e6 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..094321fdec8e071749a25633e9045b2367b2860f --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-openal:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c35c6518f95447da22bb6bc1e5eb77353ac786a --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-openal:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..24121c2ac5c3e85eac2364a7a2245a6fa9ca70cd --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-opengl:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..4a6eab960de86d2070d56d3712b1f563a0b5fe72 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-opengl:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..8155b1d9f1cafbdb9f1f61bfe47964a335361c48 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-stb:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_windows_3_2_2.xml b/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_windows_3_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..ac60d0661595293883e623a379de58668e318875 --- /dev/null +++ b/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_windows_3_2_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Maven: org.lwjgl:lwjgl-stb:natives-windows:3.2.2"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-natives-windows.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d13c6182e452e33a3bd638e70a0146c785..88999e99283613123f6b81477bc6e063f87c082a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager"> + <component name="MavenProjectsManager"> + <option name="originalFiles"> + <list> + <option value="$PROJECT_DIR$/pom.xml" /> + </list> + </option> + </component> + <component name="ProjectRootManager" version="2" project-jdk-name="openjdk-15" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 8d9dd66b04762f9320b7c2d28f991c560b32427b..d4754eaf30e6aef9fd18e15d5f94dcd7b30f5d25 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> - <module fileurl="file://$PROJECT_DIR$/yiya-project-2.iml" filepath="$PROJECT_DIR$/yiya-project-2.iml" /> + <module fileurl="file://$PROJECT_DIR$/bagel.iml" filepath="$PROJECT_DIR$/bagel.iml" /> </modules> </component> </project> \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000000000000000000000000000000000000..e96534fb27b68192f27f985d3879e173ec77adb8 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> +</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddfbbc029bcab630581847471d7f238ec53..94a25f7f4cb416c083d265558da75d457237d671 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/bagel.iml b/bagel.iml new file mode 100644 index 0000000000000000000000000000000000000000..bb67b4e1de0124283d12a2911f01ac2b569e3b23 --- /dev/null +++ b/bagel.iml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: io.github.eleanor-em:bagel:1.9.3" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-assimp:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-glfw:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-openal:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-opengl:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-stb:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl:natives-windows:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-assimp:natives-windows:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-glfw:natives-windows:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-openal:natives-windows:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-opengl:natives-windows:3.2.2" level="project" /> + <orderEntry type="library" name="Maven: org.lwjgl:lwjgl-stb:natives-windows:3.2.2" level="project" /> + </component> +</module> \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..c51fbeb6edb5f5974c1fb74356f6ef57a90b4965 --- /dev/null +++ b/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>au.edu.unimelb.cis</groupId> + <artifactId>bagel</artifactId> + <version>0.1-SNAPSHOT</version> + <packaging>jar</packaging> + + <build> + <sourceDirectory>src/</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>14</source> + <target>14</target> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <maven.compiler.source>14</maven.compiler.source> + <maven.compiler.target>14</maven.compiler.target> + </properties> + + <dependencies> + <dependency> + <groupId>io.github.eleanor-em</groupId> + <artifactId>bagel</artifactId> + <version>1.9.3</version> + </dependency> + </dependencies> +</project> diff --git a/src/Bullet.java b/src/Bullet.java new file mode 100644 index 0000000000000000000000000000000000000000..9eab720416bf1cae2a7e898fcbdfcab4a7b0b51d --- /dev/null +++ b/src/Bullet.java @@ -0,0 +1,30 @@ +import java.util.ArrayList; + +public class Bullet extends Entity implements Movable { + private double xDirection, yDirection; + + protected Bullet(String filename, double x, double y, double xDirection, double yDirection) { + super(filename, x, y); + this.xDirection = xDirection; + this.yDirection = yDirection; + } + + public double getxDirection() { + return xDirection; + } + + public double getyDirection() { + return yDirection; + } + + protected void kill(ArrayList<Zombie> zombies, int index) { + zombies.get(index).killed(); + } + + @Override + public void move(double xStep, double yStep) { + this.setX(this.getX() + xStep); + this.setY(this.getY() + yStep); + } + +} diff --git a/src/Movable.java b/src/Movable.java new file mode 100644 index 0000000000000000000000000000000000000000..ba132dd7b5da5021732b65d1aadc92b6957eaf61 --- /dev/null +++ b/src/Movable.java @@ -0,0 +1,3 @@ +public interface Movable { + public void move(double xStep, double yStep); +} \ No newline at end of file diff --git a/src/Player.java b/src/Player.java index 15f8e888e21cc0bcb9125a11524dd6beb0dfc1c4..4ef6408caff5e57c7eceefbdcfce9e2e81eabf4e 100644 --- a/src/Player.java +++ b/src/Player.java @@ -1,6 +1,4 @@ -import bagel.Window; - -public class Player extends Entity{ +public class Player extends Entity implements Movable{ private Energy energy; protected Player(String filename, double x, double y, int energy) { @@ -20,4 +18,10 @@ public class Player extends Entity{ this.updateEnergy(+5); sandwich.eaten(); } + + @Override + public void move(double xStep, double yStep) { + this.setX(this.getX() + xStep); + this.setY(this.getY() + yStep); + } } diff --git a/src/Treasure.java b/src/Treasure.java new file mode 100644 index 0000000000000000000000000000000000000000..b7dc5f7b412d4f630318956f90f01ace04bbccbd --- /dev/null +++ b/src/Treasure.java @@ -0,0 +1,15 @@ +public class Treasure extends Entity { + private boolean found = false; + + protected Treasure(String filename, double x, double y) { + super(filename, x, y); + } + + protected void found() { + found = true; + } + + protected boolean isFound() { + return found; + } +} \ No newline at end of file diff --git a/src/Zombie.java b/src/Zombie.java index 43246a11a760bf078266310ff646140ed1a4b8bd..b0e61c42d95403667d5b0a5aa4679d4f6b63d28b 100644 --- a/src/Zombie.java +++ b/src/Zombie.java @@ -2,4 +2,8 @@ public class Zombie extends Entity{ protected Zombie(String filename, double x, double y) { super(filename, x, y); } + + protected void killed() { + + } } \ No newline at end of file diff --git a/target/bagel-0.1-SNAPSHOT.jar b/target/bagel-0.1-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..7971ca9e1c1ad59e287794ee370250934dd0f6ec Binary files /dev/null and b/target/bagel-0.1-SNAPSHOT.jar differ diff --git a/target/classes/Energy.class b/target/classes/Energy.class new file mode 100644 index 0000000000000000000000000000000000000000..cd528fe588963f4fbbefc7ad9c0ed8e1b93183d5 Binary files /dev/null and b/target/classes/Energy.class differ diff --git a/target/classes/Entity.class b/target/classes/Entity.class new file mode 100644 index 0000000000000000000000000000000000000000..b659342fa1efcd1e7edc6f3b2adbeba8372fc7fa Binary files /dev/null and b/target/classes/Entity.class differ diff --git a/target/classes/IO/environment.csv b/target/classes/IO/environment.csv new file mode 100644 index 0000000000000000000000000000000000000000..99f4061217923093bbeec74f5304f5a141c714f1 --- /dev/null +++ b/target/classes/IO/environment.csv @@ -0,0 +1,3 @@ +Player,650,100,2 +Zombie,300,200 +Sandwich,500,400 \ No newline at end of file diff --git a/target/classes/Player.class b/target/classes/Player.class new file mode 100644 index 0000000000000000000000000000000000000000..3a0c3f5d4eb3b2875a140b8a0a29834fcc91c597 Binary files /dev/null and b/target/classes/Player.class differ diff --git a/target/classes/Sandwich.class b/target/classes/Sandwich.class new file mode 100644 index 0000000000000000000000000000000000000000..152212ccb1361ab8e959bac9157f5b6758698d39 Binary files /dev/null and b/target/classes/Sandwich.class differ diff --git a/target/classes/ShadowTreasure.class b/target/classes/ShadowTreasure.class new file mode 100644 index 0000000000000000000000000000000000000000..44025b593df3de73b399bf3b39f28aa5ff878a1b Binary files /dev/null and b/target/classes/ShadowTreasure.class differ diff --git a/target/classes/Zombie.class b/target/classes/Zombie.class new file mode 100644 index 0000000000000000000000000000000000000000..171b44e2235df4233e585060cbd3ffc7bafd4d4d Binary files /dev/null and b/target/classes/Zombie.class differ diff --git a/target/classes/font/DejaVuSans-Bold.ttf b/target/classes/font/DejaVuSans-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..c0d8e5e462df7f268efba09f6931e37daad151e1 Binary files /dev/null and b/target/classes/font/DejaVuSans-Bold.ttf differ diff --git a/target/classes/images/background.png b/target/classes/images/background.png new file mode 100644 index 0000000000000000000000000000000000000000..a6601996a24eebf1b568ad8e05d2e137a030b52e Binary files /dev/null and b/target/classes/images/background.png differ diff --git a/target/classes/images/player.png b/target/classes/images/player.png new file mode 100644 index 0000000000000000000000000000000000000000..103a2ff1c64ccd5bf18b9ef8b2ca444dbdf204d1 Binary files /dev/null and b/target/classes/images/player.png differ diff --git a/target/classes/images/sandwich.png b/target/classes/images/sandwich.png new file mode 100644 index 0000000000000000000000000000000000000000..87e12ec3db6704914262fd359822407fb9ecd172 Binary files /dev/null and b/target/classes/images/sandwich.png differ diff --git a/target/classes/images/zombie.png b/target/classes/images/zombie.png new file mode 100644 index 0000000000000000000000000000000000000000..41519c41828d76f5cdfbd9493025d3867347d926 Binary files /dev/null and b/target/classes/images/zombie.png differ diff --git a/target/classes/test1/environment.csv b/target/classes/test1/environment.csv new file mode 100644 index 0000000000000000000000000000000000000000..99f4061217923093bbeec74f5304f5a141c714f1 --- /dev/null +++ b/target/classes/test1/environment.csv @@ -0,0 +1,3 @@ +Player,650,100,2 +Zombie,300,200 +Sandwich,500,400 \ No newline at end of file diff --git a/target/classes/test1/output.csv b/target/classes/test1/output.csv new file mode 100644 index 0000000000000000000000000000000000000000..331f2949d096b29343572835ee807a617e1e88de --- /dev/null +++ b/target/classes/test1/output.csv @@ -0,0 +1,53 @@ +650.00,100.00,2 +645.53,108.94,2 +641.06,117.89,2 +636.58,126.83,2 +632.11,135.78,2 +627.64,144.72,2 +623.17,153.67,2 +618.70,162.61,2 +614.22,171.55,2 +609.75,180.50,2 +605.28,189.44,2 +600.81,198.39,2 +596.33,207.33,2 +591.86,216.28,2 +587.39,225.22,2 +582.92,234.16,2 +578.45,243.11,2 +573.97,252.05,2 +569.50,261.00,2 +565.03,269.94,2 +560.56,278.89,2 +556.09,287.83,2 +551.61,296.77,2 +547.14,305.72,2 +542.67,314.66,2 +538.20,323.61,2 +533.72,332.55,2 +529.25,341.50,2 +524.78,350.44,2 +520.31,359.38,7 +512.21,353.52,7 +504.10,347.66,7 +496.00,341.80,7 +487.90,335.94,7 +479.80,330.08,7 +471.70,324.21,7 +463.59,318.35,7 +455.49,312.49,7 +447.39,306.63,7 +439.29,300.77,7 +431.19,294.91,7 +423.08,289.05,7 +414.98,283.18,7 +406.88,277.32,7 +398.78,271.46,7 +390.68,265.60,7 +382.57,259.74,7 +374.47,253.88,7 +366.37,248.02,7 +358.27,242.15,7 +350.17,236.29,7 +342.06,230.43,7 +333.96,224.57,4 diff --git a/target/classes/test2/environment.csv b/target/classes/test2/environment.csv new file mode 100644 index 0000000000000000000000000000000000000000..1988788df9eb191b98835825becdab71d1122546 --- /dev/null +++ b/target/classes/test2/environment.csv @@ -0,0 +1,3 @@ +Player,650,100,3 +Zombie,500,500 +Sandwich,300,200 \ No newline at end of file diff --git a/target/classes/test2/output.csv b/target/classes/test2/output.csv new file mode 100644 index 0000000000000000000000000000000000000000..85bdc5c3a6f2228b4c3a76410bbe6a043b63634e --- /dev/null +++ b/target/classes/test2/output.csv @@ -0,0 +1,39 @@ +650.00,100.00,3 +646.49,109.36,3 +642.98,118.73,3 +639.47,128.09,3 +635.96,137.45,3 +632.44,146.82,3 +628.93,156.18,3 +625.42,165.54,3 +621.91,174.91,3 +618.40,184.27,3 +614.89,193.63,3 +611.38,203.00,3 +607.87,212.36,3 +604.35,221.72,3 +600.84,231.09,3 +597.33,240.45,3 +593.82,249.81,3 +590.31,259.18,3 +586.80,268.54,3 +583.29,277.90,3 +579.78,287.27,3 +576.26,296.63,3 +572.75,305.99,3 +569.24,315.36,3 +565.73,324.72,3 +562.22,334.08,3 +558.71,343.45,3 +555.20,352.81,3 +551.69,362.17,3 +548.17,371.54,3 +544.66,380.90,3 +541.15,390.26,3 +537.64,399.63,3 +534.13,408.99,3 +530.62,418.35,3 +527.11,427.72,3 +523.60,437.08,3 +520.08,446.44,3 +516.57,455.81,0 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000000000000000000000000000000000000..f50533bad05a26dbc0891a8c413e57c7bfd9d17d --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Thu Mar 18 12:46:42 AEDT 2021 +groupId=au.edu.unimelb.cis +artifactId=bagel +version=0.1-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000000000000000000000000000000000000..253ae07e82b3e0fff072cc239eba9ee9d4c51140 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,5 @@ +ShadowTreasure.class +Zombie.class +Sandwich.class +Record.class +Player.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000000000000000000000000000000000000..cde17032e59ef7d58ce0e5e35b62db883326bf25 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,5 @@ +/Users/nid1/Desktop/ShadowTreasure/project1/src/Zombie.java +/Users/nid1/Desktop/ShadowTreasure/project1/src/Sandwich.java +/Users/nid1/Desktop/ShadowTreasure/project1/src/Record.java +/Users/nid1/Desktop/ShadowTreasure/project1/src/ShadowTreasure.java +/Users/nid1/Desktop/ShadowTreasure/project1/src/Player.java diff --git a/yiya-project-2.iml b/yiya-project-2.iml deleted file mode 100644 index d5162cfeaa107bf8464eab7fb8f227bd870485d0..0000000000000000000000000000000000000000 --- a/yiya-project-2.iml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/test" type="java-resource" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> \ No newline at end of file