Skip to content

Commit

Permalink
Changed how the images work in a jar file
Browse files Browse the repository at this point in the history
  • Loading branch information
suncloudsmoon committed Jul 20, 2020
1 parent c04689d commit 15c1063
Show file tree
Hide file tree
Showing 20 changed files with 48 additions and 37 deletions.
1 change: 1 addition & 0 deletions Traveler/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="res"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file modified Traveler/bin/Background.class
Binary file not shown.
Binary file modified Traveler/bin/Draw.class
Binary file not shown.
Binary file modified Traveler/bin/Hut.class
Binary file not shown.
Binary file modified Traveler/bin/Main.class
Binary file not shown.
Binary file modified Traveler/bin/Player.class
Binary file not shown.
Binary file modified Traveler/bin/Tree.class
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
21 changes: 13 additions & 8 deletions Traveler/src/Background.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ public class Background {
private static int[] hutY = Hut.posY();

private static int backgroundImgCounter = 0;


private static Hut hut = new Hut();
protected static Tree tree = new Tree();

public static void backgroundImageRender(Graphics g) {

if (backgroundImgCounter == 0) {
Expand All @@ -38,14 +41,14 @@ public static void backgroundImageRender(Graphics g) {
g.fillRect(0, 0, 900, 800);

// Adding huts to this game!
g.drawImage(Hut.hutImage(), hutX[0], hutY[0], null);
g.drawImage(Hut.hutImage(), hutX[1], hutY[1], null);
g.drawImage(Hut.hutImage(), hutX[2], hutY[2], null);
g.drawImage(hut.hutImage(), hutX[0], hutY[0], null);
g.drawImage(hut.hutImage(), hutX[1], hutY[1], null);
g.drawImage(hut.hutImage(), hutX[2], hutY[2], null);

// Adding Trees to the game!
g.drawImage(Tree.getRedWoodImg()[0], Tree.getTreeX()[0], Tree.getTreeY()[0], null);
g.drawImage(Tree.getRedWoodImg()[1], Tree.getTreeX()[1], Tree.getTreeY()[1], null);
g.drawImage(Tree.getRedWoodImg()[2], Tree.getTreeX()[2], Tree.getTreeY()[2], null);
g.drawImage(tree.getRedWoodImg()[0], Tree.getTreeX()[0], Tree.getTreeY()[0], null);
g.drawImage(tree.getRedWoodImg()[1], Tree.getTreeX()[1], Tree.getTreeY()[1], null);
g.drawImage(tree.getRedWoodImg()[2], Tree.getTreeX()[2], Tree.getTreeY()[2], null);

}

Expand All @@ -55,10 +58,12 @@ public static Image backgroundImage() {

public static void backgroundImageExport() {
try {
ImageIO.write(backgroundimg, "png", new File("Background.png"));
new File("C:\\Traveler\\Export\\Background.png").mkdirs();
ImageIO.write(backgroundimg, "png", new File("C:\\Traveler\\Export\\Background.png"));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Main.log.info(e.getMessage());
}

}
Expand Down
18 changes: 8 additions & 10 deletions Traveler/src/Hut.java
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;

import javax.imageio.ImageIO;

public class Hut {

private static BufferedImage hut;
private static Image hut;
private static int[] x = new int[3]; // Access this by x[1] etc
private static int[] y = new int[3];

public static Image hutImage() {
public Image hutImage() {
try {
hut = ImageIO.read(new File("Hut.png"));
hut = ImageIO.read(getClass().getClassLoader().getResource("Hut.png"));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

return hut;
}

// Make sure the huts don't interfere with each other!
public static int[] posX() {
for (int i = 0; i < 3; i++) {
x[i] = (int)(Math.random() * 750);
x[i] = (int) (Math.random() * 750);
}
return x;
}

public static int[] posY() {
for (int i = 0; i < 3; i++) {
y[i] = (int)(Math.random() * 730);
y[i] = (int) (Math.random() * 730);
}
return y;
}

}
26 changes: 17 additions & 9 deletions Traveler/src/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ class Draw extends JPanel {

public static boolean isBackgroundRenderNeeded = true;

private static Player player = new Player();

public void onScreen(Graphics g) {
g.drawImage(Background.backgroundImage(), 0, 0, null);

// Adding the player to the game!
if (isLeft == true) {
g.drawImage(Player.playerImage()[0], x, y, null);
g.drawImage(player.playerImage()[0], x, y, null);
} else {
g.drawImage(Player.playerImage()[1], x, y, null);
g.drawImage(player.playerImage()[1], x, y, null);
}

g.drawString("X: " + x + " Y: " + y, 10, 10);

// System.gc();

if (treeCuttingLine == true) {
// After the tree cutting ends, the backgroundRenderNeeded should be false!
g.setColor(Color.blue);
Expand All @@ -57,7 +57,7 @@ public void paintComponent(Graphics g) {
if (isBackgroundRenderNeeded == true) {
if (isKeyPressedI == true) {
Tree.redWoodRender = true;
Tree.getRedWoodImg();
Background.tree.getRedWoodImg();
isKeyPressedI = false;
}
Background.backgroundImageRender(g);
Expand All @@ -80,7 +80,7 @@ public class Main implements KeyListener {
private static JFrame frame;
private static Draw draw = new Draw();

private static Logger log;
public static Logger log;

public Main() {

Expand All @@ -90,6 +90,7 @@ public Main() {
| UnsupportedLookAndFeelException e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.info(e.getMessage());
}

new File("C:\\Traveler\\LocalData").mkdirs();
Expand All @@ -98,13 +99,16 @@ public Main() {
log = Logger.getLogger(""); // getlogger!
FileHandler handleit = null;
try {
handleit = new FileHandler("C:\\Traveler\\Log.log");
handleit = new FileHandler("C:\\Traveler\\Log.log", true);
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.info(e.getMessage());
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.info(e.getMessage());

}
SimpleFormatter formatit = new SimpleFormatter();
log.addHandler(handleit);
Expand Down Expand Up @@ -172,19 +176,21 @@ public void keyPressed(KeyEvent e) {
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
log.info(e1.getMessage());
}
}
if (e.getKeyCode() == KeyEvent.VK_S) {
if (Draw.y < 729) {
Draw.y += 2;
}
}
proximitySensor();
draw.repaint();
try {
Thread.sleep(10);
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
log.info(e1.getMessage());
}
}
if (e.getKeyCode() == KeyEvent.VK_A) {
Expand All @@ -199,12 +205,13 @@ public void keyPressed(KeyEvent e) {
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
log.info(e1.getMessage());
}
}
if (e.getKeyCode() == KeyEvent.VK_D) {
if (Draw.x < 842) {
Draw.x += 2;
}
}
proximitySensor();
Draw.isLeft = false;
draw.repaint();
Expand All @@ -213,6 +220,7 @@ public void keyPressed(KeyEvent e) {
} catch (InterruptedException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
log.info(e1.getMessage());
}
}

Expand Down
9 changes: 4 additions & 5 deletions Traveler/src/Player.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;

import javax.imageio.ImageIO;
Expand All @@ -15,15 +14,15 @@ public class Player {

private static boolean playerImageRender = true;

public static Image[] playerImage() {

public Image[] playerImage() {
if (playerImageRender == true) {
try {
player[0] = ImageIO.read(new File("Left Player Position.png"));
player[1] = ImageIO.read(new File("Right Player Position.png"));
player[0] = ImageIO.read(getClass().getClassLoader().getResource("Left Player Position.png"));
player[1] = ImageIO.read(getClass().getClassLoader().getResource("Right Player Position.png"));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Main.log.info(e.getMessage());
}
playerImageRender = false;
}
Expand Down
10 changes: 5 additions & 5 deletions Traveler/src/Tree.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;

import javax.imageio.ImageIO;

Expand Down Expand Up @@ -40,18 +38,19 @@ public static void setTreeY(int[] treeY) {
}

// Create different types of trees
public static Image[] getRedWoodImg() {
public Image[] getRedWoodImg() {
if (redWoodRender == true) {
try {
if (treeRenderOncecounter == 0) {
for (int i = 0; i < 3; i++) {
redWood[i] = ImageIO.read(new File("Red Wood.png"));
redWood[i] = ImageIO.read(getClass().getClassLoader().getResource("Red Wood.png"));
}
treeRenderOncecounter++;
}

if (Draw.isKeyPressedI) {
redWood[Draw.needToCutTreeNumber] = ImageIO.read(new File("Red Wood #" + stage[Draw.needToCutTreeNumber] + ".png"));
redWood[Draw.needToCutTreeNumber] = ImageIO.read(getClass().getClassLoader().getResource("Red Wood #" + stage[Draw.needToCutTreeNumber] + ".png"));

if (stage[Draw.needToCutTreeNumber] < 3) {
stage[Draw.needToCutTreeNumber] += 1;
}
Expand All @@ -61,6 +60,7 @@ public static Image[] getRedWoodImg() {
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Main.log.info(e.getMessage());
}

redWoodRender = false;
Expand Down

0 comments on commit 15c1063

Please sign in to comment.