From c0134fa87d96671fe714b0c8d26c75b4de7b06da Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 10:30:49 +0000 Subject: [PATCH 01/13] Update README.md --- README.md | 98 ++++++++----------------------------------------------- 1 file changed, 14 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index cf97195..44c2008 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,22 @@ -# FertigJavaGamelauncher +# Das ist die Readme für unser Gamelauncher +## Beteiligte: @Fdai7431, @Fdai7382, @Fdai7551 und @Fdai7388 +### Was ist der Plan? +- Wir wollen mit der Hilfe von Java einen GameLauncher mit min. einem Game programmieren. +### Wie machen wir das? -## Getting started +-Wir nutzen unsere Programmierkenntnisse aus dem Abi -To make it easy for you to get started with GitLab, here's a list of recommended next steps. +### Was wird zum Programmieren benötigt?: +- Eclipse. +- Java. +- E-Girl zur ablenkung. -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! +### Bewertung: -## Add your files +- Noicer Doicer -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: +#### Verlauf: -``` -cd existing_repo -git remote add origin https://gitlab2.informatik.hs-fulda.de/fdai7382/fertigjavagamelauncher.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab2.informatik.hs-fulda.de/fdai7382/fertigjavagamelauncher/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +### Kritik: From e2bc9d8745c9e9d668c041a53460fa620807135b Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 10:33:58 +0000 Subject: [PATCH 02/13] Add new file --- team.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 team.md diff --git a/team.md b/team.md new file mode 100644 index 0000000..d58cff0 --- /dev/null +++ b/team.md @@ -0,0 +1,5 @@ +- Thomas Papendieck, fdai0127 +- Jonathan Hickl, fdai7431 +- Eric Bergstreißer, fdai7382 +- Jona Lukas Zahn, fdai7551 +- Marlon Carl Gütschow, fdai7388 From 71f3b2a680e9b4c794087ab27db08c2df6242a10 Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:14:23 +0100 Subject: [PATCH 03/13] [GamelauncherMain Class]: Button Initialisiert --- JavaGamelauncher/.classpath | 66 +++++++++---------- .../JavaGamelauncher/GamelauncherMain.java | 6 ++ 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/JavaGamelauncher/.classpath b/JavaGamelauncher/.classpath index db956d9..6a86c23 100644 --- a/JavaGamelauncher/.classpath +++ b/JavaGamelauncher/.classpath @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 9162bef..d6c9509 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -3,6 +3,7 @@ package de.hs_fulda.gruppenprojekt.JavaGamelauncher; import java.awt.Color; import java.awt.EventQueue; +import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; @@ -61,6 +62,11 @@ public class GamelauncherMain extends JFrame {//class setBackground(Color.DARK_GRAY); contentPane.setForeground(Color.GRAY); contentPane.setBackground(Color.DARK_GRAY); + + JButton btnSnake = new JButton("Snake Starten"); + JButton btnMouse = new JButton("Mouse Starten"); + JButton btnTikTakToe = new JButton("TikTakToe Starten"); + JButton btnTextadventure = new JButton("Textadventure Starten"); }//end standardkonstruktor From b768691cf5d9bf0794f773dc54c59559bc118b9a Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:19:37 +0100 Subject: [PATCH 04/13] [GamelauncherMain Class]: Weitere Definitionen fuer Button --- .../JavaGamelauncher/GamelauncherMain.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index d6c9509..0dea208 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -2,6 +2,7 @@ package de.hs_fulda.gruppenprojekt.JavaGamelauncher; import java.awt.Color; import java.awt.EventQueue; +import java.awt.Font; import javax.swing.JButton; import javax.swing.JFrame; @@ -68,6 +69,21 @@ public class GamelauncherMain extends JFrame {//class JButton btnTikTakToe = new JButton("TikTakToe Starten"); JButton btnTextadventure = new JButton("Textadventure Starten"); + btnSnake.setBackground(Color.PINK); + btnMouse.setBackground(Color.PINK); + btnTikTakToe.setBackground(Color.PINK); + btnTextadventure.setBackground(Color.PINK); + + btnSnake.setFont(new Font("Consolas", Font.PLAIN, 12)); + btnMouse.setFont(new Font("Consolas", Font.PLAIN, 12)); + btnTikTakToe.setFont(new Font("Consolas", Font.PLAIN, 12)); + btnTextadventure.setFont(new Font("Consolas", Font.PLAIN, 12)); + + btnSnake.setBounds(10, 500, 300, 25); + btnTikTakToe.setBounds(630, 500, 300, 25); + btnMouse.setBounds(320, 500, 300, 25); + btnTextadventure.setBounds(940, 500, 300, 25); + }//end standardkonstruktor }//end class From 052ae4807a9d399496c3043a1526717977e73741 Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:20:21 +0100 Subject: [PATCH 05/13] [GamelauncherMain Class]: Button zum Panel hinzugefuegt --- .../gruppenprojekt/JavaGamelauncher/GamelauncherMain.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 0dea208..92258d3 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -84,6 +84,11 @@ public class GamelauncherMain extends JFrame {//class btnMouse.setBounds(320, 500, 300, 25); btnTextadventure.setBounds(940, 500, 300, 25); + contentPane.add(btnSnake); + contentPane.add(btnMouse); + contentPane.add(btnTikTakToe); + contentPane.add(btnTextadventure); + }//end standardkonstruktor }//end class From 2ecb7d5a23851f1e09a59a5ea4fb6efb6657016c Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:22:31 +0100 Subject: [PATCH 06/13] [GamelauncherMain Class]: Actionlistener fuer Button --- .../JavaGamelauncher/GamelauncherMain.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 92258d3..a06ae9c 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -3,6 +3,8 @@ package de.hs_fulda.gruppenprojekt.JavaGamelauncher; import java.awt.Color; import java.awt.EventQueue; import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JFrame; @@ -89,6 +91,18 @@ public class GamelauncherMain extends JFrame {//class contentPane.add(btnTikTakToe); contentPane.add(btnTextadventure); + btnSnake.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + // TODO Auto-generated method stub + + //SnakeGame frameSnake = new SnakeGame(); + //frameSnake.setVisible(true); + } + }); + + }//end standardkonstruktor }//end class From 772386ed2caf0ede57efdd9ac643fe9641c8343f Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:23:14 +0100 Subject: [PATCH 07/13] [GamelauncherMain Class]: Actionlistener fuer Button --- .../JavaGamelauncher/GamelauncherMain.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index a06ae9c..d2499b2 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -102,6 +102,17 @@ public class GamelauncherMain extends JFrame {//class } }); + btnMouse.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + // TODO Auto-generated method stub + + MouseGame frameMouse = new MouseGame(); + //frameMouse.setVisible(true); + } + }); + }//end standardkonstruktor From bbfac002ffcb79e576ee4126e5a4c41838ccc2eb Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:23:59 +0100 Subject: [PATCH 08/13] [GamelauncherMain Class]: Actionlistener fuer Button --- .../JavaGamelauncher/GamelauncherMain.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index d2499b2..67f7184 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -113,6 +113,18 @@ public class GamelauncherMain extends JFrame {//class } }); + btnTikTakToe.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + // TODO Auto-generated method stub + + //TikTakToeGame frameTikTakToe = new TikTakToeGame(); + //frameTikTakToe.setVisible(true); + } + }); + + }//end standardkonstruktor From 6832a95aa4032af2ed93b9b0011df2514ec2359d Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:24:26 +0100 Subject: [PATCH 09/13] [GamelauncherMain Class]: Actionlistener fuer Button --- .../JavaGamelauncher/GamelauncherMain.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 67f7184..44aaa48 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -124,6 +124,17 @@ public class GamelauncherMain extends JFrame {//class } }); + btnTextadventure.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + // TODO Auto-generated method stub + + //TextadventureGame frameTextadventure = new TextadventureGame(); + //frameTextadventure.setVisible(true); + } + }); + }//end standardkonstruktor From 0c80bf9f2b58ba00523f88b350e102cebed77999 Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:27:03 +0100 Subject: [PATCH 10/13] [GamelauncherMain Class]: JLabel Initialisiert --- .../JavaGamelauncher/GamelauncherMain.java | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 44aaa48..0a2d1f2 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -1,15 +1,38 @@ package de.hs_fulda.gruppenprojekt.JavaGamelauncher; + +import java.awt.AWTException; +import java.awt.BorderLayout; +import java.awt.CardLayout; import java.awt.Color; -import java.awt.EventQueue; -import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - +import java.awt.EventQueue; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.image.BufferedImage; +import java.awt.Image; +import java.awt.Taskbar; +import java.awt.Toolkit; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.lang.System.Logger.Level; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import javax.swing.border.EmptyBorder; +import javax.swing.GroupLayout.Alignment; +import javax.swing.GroupLayout; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; +import javax.swing.LayoutStyle.ComponentPlacement; +import javax.swing.SwingConstants; public class GamelauncherMain extends JFrame {//class @@ -135,6 +158,10 @@ public class GamelauncherMain extends JFrame {//class } }); + JLabel AdSnake = new JLabel(""); + JLabel AdMouse = new JLabel(""); + JLabel AdTikTakToe = new JLabel(""); + JLabel AdTextadventure = new JLabel(""); }//end standardkonstruktor From 3fb91c05a4df716e2deef99f5492d4d6874c1a6d Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:48:38 +0100 Subject: [PATCH 11/13] [GamelauncherMain Class]: Weitere Defintionen fuer labels --- .../JavaGamelauncher/GamelauncherMain.java | 18 ++++++++++++++++++ .../media/{maze.gif => Mouse3.gif} | Bin 2 files changed, 18 insertions(+) rename JavaGamelauncher/src/main/resources/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/{maze.gif => Mouse3.gif} (100%) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 0a2d1f2..4bd70fb 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -163,6 +163,24 @@ public class GamelauncherMain extends JFrame {//class JLabel AdTikTakToe = new JLabel(""); JLabel AdTextadventure = new JLabel(""); + AdSnake.setForeground(Color.GRAY); + AdSnake.setBackground(Color.DARK_GRAY); + AdMouse.setForeground(Color.GRAY); + AdMouse.setBackground(Color.DARK_GRAY); + AdTikTakToe.setForeground(Color.GRAY); + AdTikTakToe.setBackground(Color.DARK_GRAY); + AdTextadventure.setBackground(Color.DARK_GRAY); + AdTextadventure.setForeground(Color.GRAY); + + AdSnake.setBounds(10, 10, 300, 400); + AdMouse.setBounds(320, 10, 300, 400); + AdTikTakToe.setBounds(630, 10, 300, 400); + AdTextadventure.setBounds(940, 10, 300, 400); + + AdSnake.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Snake3.gif"))); + AdMouse.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Mouse3.gif"))); + AdTikTakToe.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/TikTakToe3.gif"))); + AdTextadventure.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Textadventure3.gif"))); }//end standardkonstruktor diff --git a/JavaGamelauncher/src/main/resources/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/maze.gif b/JavaGamelauncher/src/main/resources/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Mouse3.gif similarity index 100% rename from JavaGamelauncher/src/main/resources/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/maze.gif rename to JavaGamelauncher/src/main/resources/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Mouse3.gif From fef3fe1d8385e62e2d882d8134d6448fa69257bc Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:49:56 +0100 Subject: [PATCH 12/13] [GamelauncherMain Class]: JLabels zum Pane hinzugefuegt --- .../gruppenprojekt/JavaGamelauncher/GamelauncherMain.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 4bd70fb..20205a3 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -182,6 +182,10 @@ public class GamelauncherMain extends JFrame {//class AdTikTakToe.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/TikTakToe3.gif"))); AdTextadventure.setIcon(new ImageIcon(GamelauncherMain.class.getResource("/de/hs_fulda/gruppenprojekt/JavaGamelauncher/media/Textadventure3.gif"))); + contentPane.add(AdSnake); + contentPane.add(AdMouse); + contentPane.add(AdTikTakToe); + contentPane.add(AdTextadventure); }//end standardkonstruktor }//end class From cb109c59fac4f1f4772e6437ebde8185380eca15 Mon Sep 17 00:00:00 2001 From: fdai7431 Date: Mon, 16 Jan 2023 12:51:16 +0100 Subject: [PATCH 13/13] refactoring:[GamelauncherMain Class]: unnoetige libs entfernt --- .../JavaGamelauncher/GamelauncherMain.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java index 20205a3..6ebf269 100644 --- a/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java +++ b/JavaGamelauncher/src/main/java/de/hs_fulda/gruppenprojekt/JavaGamelauncher/GamelauncherMain.java @@ -1,38 +1,18 @@ package de.hs_fulda.gruppenprojekt.JavaGamelauncher; -import java.awt.AWTException; -import java.awt.BorderLayout; -import java.awt.CardLayout; import java.awt.Color; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.EventQueue; -import java.awt.FlowLayout; import java.awt.Font; -import java.awt.image.BufferedImage; -import java.awt.Image; -import java.awt.Taskbar; -import java.awt.Toolkit; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.System.Logger.Level; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.logging.Logger; -import javax.imageio.ImageIO; -import javax.swing.border.EmptyBorder; -import javax.swing.GroupLayout.Alignment; -import javax.swing.GroupLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.LayoutStyle.ComponentPlacement; -import javax.swing.SwingConstants; +import javax.swing.border.EmptyBorder; public class GamelauncherMain extends JFrame {//class