diff --git a/build.gradle.kts b/build.gradle.kts index 6967a47..e773016 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } group = "dev.dvorakmortonxd" -version = "1.0-SNAPSHOT" +version = "0.0.1a" repositories { mavenCentral() @@ -17,4 +17,10 @@ dependencies { tasks.test { useJUnitPlatform() +} + +tasks.jar { + manifest { + attributes["Main-Class"] = "dev.dvorakmortonxd.Game" + } } \ No newline at end of file diff --git a/src/main/java/dev/dvorakmortonxd/Game.java b/src/main/java/dev/dvorakmortonxd/Game.java index 2002624..bae74cc 100644 --- a/src/main/java/dev/dvorakmortonxd/Game.java +++ b/src/main/java/dev/dvorakmortonxd/Game.java @@ -106,6 +106,10 @@ public class Game extends JPanel implements ActionListener { public int rocketBottomY; public int actionTimer = 0; + // defines the initial player variables + public int playerX = 525; + public int playerY = 375; + // Starts update.java which is basically a class that contains all the stuff that happens every tick @Override public void actionPerformed(ActionEvent e) { // update step diff --git a/src/main/java/dev/dvorakmortonxd/loadAssets.java b/src/main/java/dev/dvorakmortonxd/loadAssets.java index be8a71c..7bcc1ea 100644 --- a/src/main/java/dev/dvorakmortonxd/loadAssets.java +++ b/src/main/java/dev/dvorakmortonxd/loadAssets.java @@ -4,12 +4,14 @@ import javax.imageio.ImageIO; import java.awt.*; import java.io.File; import java.io.IOException; +import java.io.InputStream; public class loadAssets { public static void load(Game m) { // loads up the fonts try { - m.caveat = Font.createFont(Font.TRUETYPE_FONT, new File("assets/CaveatBrush-Regular.ttf")); + InputStream in = Game.class.getResourceAsStream("/assets/CaveatBrush-Regular.ttf"); + m.caveat = Font.createFont(Font.TRUETYPE_FONT, in); m.titleCaveat = m.caveat.deriveFont(Font.BOLD, 100f); } catch (FontFormatException | IOException e) { e.printStackTrace(); @@ -17,31 +19,31 @@ public class loadAssets { } // loads up the image assets try { - m.planetZX311 = ImageIO.read(new File("assets/planetZX311.png")); - m.planetZX311H = ImageIO.read(new File("assets/planetZX311Highlighted.png")); - m.button = ImageIO.read(new File("assets/button.png")); - m.buttonH = ImageIO.read(new File("assets/buttonHighlighted.png")); - m.rocket = ImageIO.read(new File("assets/rocket.png")); - m.rocketExhaust = ImageIO.read(new File("assets/rocketExhaust.png")); - m.rocketTop = ImageIO.read(new File("assets/rocketTop.png")); - m.rocketBottom = ImageIO.read(new File("assets/rocketBottom.png")); - m.parachute = ImageIO.read(new File("assets/parachute.png")); - m.landingPlatform = ImageIO.read(new File("assets/landingPlatform.png")); - m.rocketLanding0 = ImageIO.read(new File("assets/rocketLanding0.png")); - m.rocketLanding1 = ImageIO.read(new File("assets/rocketLanding1.png")); - m.sun = ImageIO.read(new File("assets/sun.png")); - m.playerForward0 = ImageIO.read(new File("assets/player/playerSpriteForward.png")); - m.playerForward1 = ImageIO.read(new File("assets/player/playerSpriteForwardWalk0.png")); - m.playerForward2 = ImageIO.read(new File("assets/player/playerSpriteForwardWalk1.png")); - m.playerBackward0 = ImageIO.read(new File("assets/player/playerSpriteBackward.png")); - m.playerBackward1 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk0.png")); - m.playerBackward2 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk1.png")); - m.playerLeft0 = ImageIO.read(new File("assets/player/playerSpriteLeft.png")); - m.playerLeft1 = ImageIO.read(new File("assets/player/playerSpriteLeftWalk0.png")); - m.playerLeft2 = ImageIO.read(new File("assets/player/playerSpriteLeftWalk1.png")); - m.playerRight0 = ImageIO.read(new File("assets/player/playerSpriteRight.png")); - m.playerRight1 = ImageIO.read(new File("assets/player/playerSpriteRightWalk0.png")); - m.playerRight2 = ImageIO.read(new File("assets/player/playerSpriteRightWalk1.png")); + m.planetZX311 = ImageIO.read(Game.class.getResource("/assets/planetZX311.png")); + m.planetZX311H = ImageIO.read(Game.class.getResource("/assets/planetZX311Highlighted.png")); + m.button = ImageIO.read(Game.class.getResource("/assets/button.png")); + m.buttonH = ImageIO.read(Game.class.getResource("/assets/buttonHighlighted.png")); + m.rocket = ImageIO.read(Game.class.getResource("/assets/rocket.png")); + m.rocketExhaust = ImageIO.read(Game.class.getResource("/assets/rocketExhaust.png")); + m.rocketTop = ImageIO.read(Game.class.getResource("/assets/rocketTop.png")); + m.rocketBottom = ImageIO.read(Game.class.getResource("/assets/rocketBottom.png")); + m.parachute = ImageIO.read(Game.class.getResource("/assets/parachute.png")); + m.landingPlatform = ImageIO.read(Game.class.getResource("/assets/landingPlatform.png")); + m.rocketLanding0 = ImageIO.read(Game.class.getResource("/assets/rocketLanding0.png")); + m.rocketLanding1 = ImageIO.read(Game.class.getResource("/assets/rocketLanding1.png")); + m.sun = ImageIO.read(Game.class.getResource("/assets/sun.png")); + m.playerForward0 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteForward.png")); + m.playerForward1 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteForwardWalk0.png")); + m.playerForward2 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteForwardWalk1.png")); + m.playerBackward0 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteBackward.png")); + m.playerBackward1 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteBackwardWalk0.png")); + m.playerBackward2 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteBackwardWalk1.png")); + m.playerLeft0 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteLeft.png")); + m.playerLeft1 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteLeftWalk0.png")); + m.playerLeft2 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteLeftWalk1.png")); + m.playerRight0 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteRight.png")); + m.playerRight1 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteRightWalk0.png")); + m.playerRight2 = ImageIO.read(Game.class.getResource("/assets/player/playerSpriteRightWalk1.png")); } catch (IOException e) { e.printStackTrace(); } diff --git a/assets/CaveatBrush-Regular.ttf b/src/main/resources/assets/CaveatBrush-Regular.ttf similarity index 100% rename from assets/CaveatBrush-Regular.ttf rename to src/main/resources/assets/CaveatBrush-Regular.ttf diff --git a/assets/button.png b/src/main/resources/assets/button.png similarity index 100% rename from assets/button.png rename to src/main/resources/assets/button.png diff --git a/assets/buttonHighlighted.png b/src/main/resources/assets/buttonHighlighted.png similarity index 100% rename from assets/buttonHighlighted.png rename to src/main/resources/assets/buttonHighlighted.png diff --git a/assets/landingPlatform.png b/src/main/resources/assets/landingPlatform.png similarity index 100% rename from assets/landingPlatform.png rename to src/main/resources/assets/landingPlatform.png diff --git a/assets/manifest.json b/src/main/resources/assets/manifest.json similarity index 100% rename from assets/manifest.json rename to src/main/resources/assets/manifest.json diff --git a/assets/parachute.png b/src/main/resources/assets/parachute.png similarity index 100% rename from assets/parachute.png rename to src/main/resources/assets/parachute.png diff --git a/assets/planetZX311.png b/src/main/resources/assets/planetZX311.png similarity index 100% rename from assets/planetZX311.png rename to src/main/resources/assets/planetZX311.png diff --git a/assets/planetZX311Highlighted.png b/src/main/resources/assets/planetZX311Highlighted.png similarity index 100% rename from assets/planetZX311Highlighted.png rename to src/main/resources/assets/planetZX311Highlighted.png diff --git a/assets/player/playerSpriteBackward.png b/src/main/resources/assets/player/playerSpriteBackward.png similarity index 100% rename from assets/player/playerSpriteBackward.png rename to src/main/resources/assets/player/playerSpriteBackward.png diff --git a/assets/player/playerSpriteBackwardWalk0.png b/src/main/resources/assets/player/playerSpriteBackwardWalk0.png similarity index 100% rename from assets/player/playerSpriteBackwardWalk0.png rename to src/main/resources/assets/player/playerSpriteBackwardWalk0.png diff --git a/assets/player/playerSpriteBackwardWalk1.png b/src/main/resources/assets/player/playerSpriteBackwardWalk1.png similarity index 100% rename from assets/player/playerSpriteBackwardWalk1.png rename to src/main/resources/assets/player/playerSpriteBackwardWalk1.png diff --git a/assets/player/playerSpriteForward.png b/src/main/resources/assets/player/playerSpriteForward.png similarity index 100% rename from assets/player/playerSpriteForward.png rename to src/main/resources/assets/player/playerSpriteForward.png diff --git a/assets/player/playerSpriteForwardWalk0.png b/src/main/resources/assets/player/playerSpriteForwardWalk0.png similarity index 100% rename from assets/player/playerSpriteForwardWalk0.png rename to src/main/resources/assets/player/playerSpriteForwardWalk0.png diff --git a/assets/player/playerSpriteForwardWalk1.png b/src/main/resources/assets/player/playerSpriteForwardWalk1.png similarity index 100% rename from assets/player/playerSpriteForwardWalk1.png rename to src/main/resources/assets/player/playerSpriteForwardWalk1.png diff --git a/assets/player/playerSpriteLeft.png b/src/main/resources/assets/player/playerSpriteLeft.png similarity index 100% rename from assets/player/playerSpriteLeft.png rename to src/main/resources/assets/player/playerSpriteLeft.png diff --git a/assets/player/playerSpriteLeftWalk0.png b/src/main/resources/assets/player/playerSpriteLeftWalk0.png similarity index 100% rename from assets/player/playerSpriteLeftWalk0.png rename to src/main/resources/assets/player/playerSpriteLeftWalk0.png diff --git a/assets/player/playerSpriteLeftWalk1.png b/src/main/resources/assets/player/playerSpriteLeftWalk1.png similarity index 100% rename from assets/player/playerSpriteLeftWalk1.png rename to src/main/resources/assets/player/playerSpriteLeftWalk1.png diff --git a/assets/player/playerSpriteRight.png b/src/main/resources/assets/player/playerSpriteRight.png similarity index 100% rename from assets/player/playerSpriteRight.png rename to src/main/resources/assets/player/playerSpriteRight.png diff --git a/assets/player/playerSpriteRightWalk0.png b/src/main/resources/assets/player/playerSpriteRightWalk0.png similarity index 100% rename from assets/player/playerSpriteRightWalk0.png rename to src/main/resources/assets/player/playerSpriteRightWalk0.png diff --git a/assets/player/playerSpriteRightWalk1.png b/src/main/resources/assets/player/playerSpriteRightWalk1.png similarity index 100% rename from assets/player/playerSpriteRightWalk1.png rename to src/main/resources/assets/player/playerSpriteRightWalk1.png diff --git a/assets/playerSpriteForward.png~ b/src/main/resources/assets/playerSpriteForward.png~ similarity index 100% rename from assets/playerSpriteForward.png~ rename to src/main/resources/assets/playerSpriteForward.png~ diff --git a/assets/rocket.png b/src/main/resources/assets/rocket.png similarity index 100% rename from assets/rocket.png rename to src/main/resources/assets/rocket.png diff --git a/assets/rocketBottom.png b/src/main/resources/assets/rocketBottom.png similarity index 100% rename from assets/rocketBottom.png rename to src/main/resources/assets/rocketBottom.png diff --git a/assets/rocketExhaust.png b/src/main/resources/assets/rocketExhaust.png similarity index 100% rename from assets/rocketExhaust.png rename to src/main/resources/assets/rocketExhaust.png diff --git a/assets/rocketLanding0.png b/src/main/resources/assets/rocketLanding0.png similarity index 100% rename from assets/rocketLanding0.png rename to src/main/resources/assets/rocketLanding0.png diff --git a/assets/rocketLanding1.png b/src/main/resources/assets/rocketLanding1.png similarity index 100% rename from assets/rocketLanding1.png rename to src/main/resources/assets/rocketLanding1.png diff --git a/assets/rocketTop.png b/src/main/resources/assets/rocketTop.png similarity index 100% rename from assets/rocketTop.png rename to src/main/resources/assets/rocketTop.png diff --git a/assets/rocket_landing0.png~ b/src/main/resources/assets/rocket_landing0.png~ similarity index 100% rename from assets/rocket_landing0.png~ rename to src/main/resources/assets/rocket_landing0.png~ diff --git a/assets/rocket_landing1.png~ b/src/main/resources/assets/rocket_landing1.png~ similarity index 100% rename from assets/rocket_landing1.png~ rename to src/main/resources/assets/rocket_landing1.png~ diff --git a/assets/sun.png b/src/main/resources/assets/sun.png similarity index 100% rename from assets/sun.png rename to src/main/resources/assets/sun.png