Skip to content

Commit 04cadf6

Browse files
redomarredomar
committed
Merge branch 'Experimental' of github.com:DylanMeeus/JavaGame into DylanMeeus-Experimental
Conflicts: src/com/redomar/game/Game.java
2 parents ac0efd0 + fa0a3d0 commit 04cadf6

File tree

16 files changed

+105
-92
lines changed

16 files changed

+105
-92
lines changed

‎src/com/redomar/game/Game.java‎

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class Game extends Canvas implements Runnable {
5757
private static int steps;
5858
private static boolean devMode;
5959
private static boolean closingMode;
60-
60+
6161
private static JFrame frame;
6262

6363
private static boolean running = false;
@@ -90,7 +90,7 @@ public class Game extends Canvas implements Runnable {
9090
private GameServer socketServer;
9191
private Printing print = new Printing();
9292
private static InputContext context;
93-
93+
9494
/**
9595
* @author Redomar
9696
* @version Alpha 1.8
@@ -143,33 +143,34 @@ public void init() {
143143

144144
// socketClient.sendData("ping".getBytes());
145145
loginPacket.writeData(getSocketClient());
146-
147-
game.setVendor(new Vendor(getLevel(), "Vendor", 215, 215, 304, 543));
148-
getLevel().addEntity(getVendor());
146+
147+
game.setVendor(new Vendor(level, "Vendor", 215, 215, 304, 543));
148+
level.addEntity(getVendor());
149149
}
150150

151151
public void setMap(String Map_str) {
152152
setLevel(new LevelHandler(Map_str));
153-
if(alternateCols[0]){
153+
if (alternateCols[0]) {
154154
Game.setShirtCol(240);
155155
}
156-
if(!alternateCols[0]){
156+
if (!alternateCols[0]) {
157157
Game.setShirtCol(111);
158158
}
159-
if(alternateCols[1]){
159+
if (alternateCols[1]) {
160160
Game.setFaceCol(310);
161161
}
162-
if(!alternateCols[1]){
162+
if (!alternateCols[1]) {
163163
Game.setFaceCol(543);
164164
}
165-
setPlayer(new PlayerMP(getLevel(), 100, 100, input,
165+
setPlayer(new PlayerMP(level, 100, 100, input,
166166
getJdata_UserName(), null, -1, shirtCol, faceCol));
167167
level.addEntity(player);
168168
}
169169

170170
public static void npcSpawn() {
171171
if (isNpc() == true) {
172-
game.setDummy(new Dummy(Game.getLevel(), "Dummy", 100, 150, 500, 543));
172+
game.setDummy(new Dummy(game.getLevel(), "Dummy", 100, 150, 500,
173+
543));
173174
game.level.addEntity(Game.getDummy());
174175
}
175176
}
@@ -235,7 +236,10 @@ public void run() {
235236

236237
if (System.currentTimeMillis() - lastTimer >= 1000) {
237238
lastTimer += 1000;
238-
getFrame().setTitle("JavaGame - Version "+WordUtils.capitalize(game_Version).substring(1, game_Version.length()));
239+
getFrame().setTitle(
240+
"JavaGame - Version "
241+
+ WordUtils.capitalize(game_Version).substring(
242+
1, game_Version.length()));
239243
fps = frames;
240244
tps = ticks;
241245
frames = 0;
@@ -247,7 +251,7 @@ public void run() {
247251

248252
public void tick() {
249253
setTickCount(getTickCount() + 1);
250-
getLevel().tick();
254+
level.tick();
251255
}
252256

253257
public void render() {
@@ -260,7 +264,7 @@ public void render() {
260264
int xOffset = (int) getPlayer().getX() - (screen.getWidth() / 2);
261265
int yOffset = (int) getPlayer().getY() - (screen.getHeight() / 2);
262266

263-
getLevel().renderTiles(screen, xOffset, yOffset);
267+
level.renderTiles(screen, xOffset, yOffset);
264268

265269
/*
266270
* for (int x = 0; x < level.width; x++) { int colour = Colours.get(-1,
@@ -269,8 +273,8 @@ public void render() {
269273
* colour, 1); }
270274
*/
271275

272-
getLevel().renderEntities(screen);
273-
getLevel().renderProjectileEntities(screen);
276+
level.renderEntities(screen);
277+
level.renderProjectileEntities(screen);
274278

275279
for (int y = 0; y < screen.getHeight(); y++) {
276280
for (int x = 0; x < screen.getWidth(); x++) {
@@ -306,19 +310,18 @@ public void render() {
306310
print.print("Teleported into new world", PrintTypes.GAME);
307311
if (getMap() == 1) {
308312
setMap("/levels/water_level.png");
309-
if(getDummy()!=null){ // Gave nullPointerException(); upon entering new world.
310-
getLevel().removeEntity(getDummy());
313+
if (getDummy() != null) { // Gave nullPointerException(); upon
314+
// entering new world.
315+
level.removeEntity(getDummy());
311316
setNpc(false);
312317
}
313-
getLevel().removeEntity(getVendor());
318+
level.removeEntity(getVendor());
314319
setMap(2);
315320
} else if (getMap() == 2) {
316321
setMap("/levels/custom_level.png");
317-
if(getDummy()!=null){
318-
getLevel().removeEntity(getDummy());
319-
setNpc(false);
320-
}
321-
getLevel().addEntity(getVendor());
322+
level.removeEntity(getDummy());
323+
setNpc(false);
324+
level.addEntity(getVendor());
322325
setMap(1);
323326
}
324327
changeLevel = false;
@@ -337,14 +340,14 @@ public void render() {
337340
+ WordUtils.capitalizeFully(player
338341
.getSantizedUsername()), 3, getHeight() - 17);
339342
g.setColor(Color.ORANGE);
340-
341-
if(context.getLocale().getCountry().equals("BE") || context.getLocale().getCountry().equals("FR"))
342-
{
343-
g.drawString("Press A to quit", (getWidth()/2)-("Press A to quit".length()*3), getHeight() -17);
344-
}
345-
else
346-
{
347-
g.drawString("Press Q to quit", (getWidth()/2)-("Press Q to quit".length()*3), getHeight() -17);
343+
344+
if (context.getLocale().getCountry().equals("BE")
345+
|| context.getLocale().getCountry().equals("FR")) {
346+
g.drawString("Press A to quit", (getWidth() / 2)
347+
- ("Press A to quit".length() * 3), getHeight() - 17);
348+
} else {
349+
g.drawString("Press Q to quit", (getWidth() / 2)
350+
- ("Press Q to quit".length() * 3), getHeight() - 17);
348351
}
349352
g.setColor(Color.YELLOW);
350353
g.drawString(time.getTime(), (getWidth() - 58), (getHeight() - 3));
@@ -383,33 +386,34 @@ public void render() {
383386
}
384387

385388
private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
386-
if (TerminalMode == true){
389+
if (TerminalMode == true) {
387390
g.setColor(Color.CYAN);
388391
g.drawString("JavaGame Stats", 0, 10);
389392
g.drawString("FPS/TPS: " + fps + "/" + tps, 0, 25);
390393
if ((player.getNumSteps() & 15) == 15) {
391394
steps += 1;
392395
}
393396
g.drawString("Foot Steps: " + steps, 0, 40);
394-
g.drawString("NPC: " + WordUtils.capitalize(String.valueOf(isNpc())) , 0, 55);
395-
g.drawString("Mouse: " + getMouse().getX() + "x |" + getMouse().getY() + "y", 0, 70);
396-
if(getMouse().getButton() != -1) g.drawString("Button: " + getMouse().getButton(), 0, 85);
397+
g.drawString(
398+
"NPC: " + WordUtils.capitalize(String.valueOf(isNpc())), 0,
399+
55);
400+
g.drawString("Mouse: " + getMouse().getX() + "x |"
401+
+ getMouse().getY() + "y", 0, 70);
402+
if (getMouse().getButton() != -1)
403+
g.drawString("Button: " + getMouse().getButton(), 0, 85);
397404
g.setColor(Color.CYAN);
398-
g.fillRect(getMouse().getX()-12, getMouse().getY()-12, 24, 24);
405+
g.fillRect(getMouse().getX() - 12, getMouse().getY() - 12, 24, 24);
399406
}
400-
if (TerminalQuit == true){
407+
if (TerminalQuit == true) {
401408
g.setColor(Color.BLACK);
402409
g.fillRect(0, 0, getWidth(), getHeight());
403410
g.setColor(Color.RED);
404-
g.drawString("Shutting down the Game", (getWidth()/2)-70, (getHeight()/2)-8);
411+
g.drawString("Shutting down the Game", (getWidth() / 2) - 70,
412+
(getHeight() / 2) - 8);
405413
g.dispose();
406414
}
407415
}
408416

409-
public static void main(String[] args) {
410-
new Menu().start();
411-
}
412-
413417
public static JFrame getFrame() {
414418
return Game.frame;
415419
}
@@ -581,12 +585,12 @@ public static boolean[] getAlternateCols() {
581585
public static void setAlternateCols(boolean[] alternateCols) {
582586
Game.alternateCols = alternateCols;
583587
}
584-
585-
public static void setAternateColsR(boolean alternateCols){
588+
589+
public static void setAternateColsR(boolean alternateCols) {
586590
Game.alternateCols[1] = alternateCols;
587591
}
588-
589-
public static void setAternateColsS(boolean alternateCols){
592+
593+
public static void setAternateColsS(boolean alternateCols) {
590594
Game.alternateCols[0] = alternateCols;
591595
}
592596

‎src/com/redomar/game/InputHandler.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,35 +73,35 @@ public void toggleKey(int keyCode, boolean isPressed) {
7373
if (isIgnoreInput() == false) {
7474
if (isAzertyCountry) {
7575
if (keyCode == KeyEvent.VK_Z || keyCode == KeyEvent.VK_UP) {
76-
getUp().toggle(isPressed);
76+
up.toggle(isPressed);
7777
}
7878

7979
if (keyCode == KeyEvent.VK_Q || keyCode == KeyEvent.VK_LEFT) {
80-
getLeft().toggle(isPressed);
80+
left.toggle(isPressed);
8181
}
8282
} else {
8383
if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
84-
getUp().toggle(isPressed);
84+
up.toggle(isPressed);
8585
}
8686

8787
if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
88-
getLeft().toggle(isPressed);
88+
left.toggle(isPressed);
8989
}
9090
}
9191

9292
if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
93-
getDown().toggle(isPressed);
93+
down.toggle(isPressed);
9494
}
9595

9696
if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
97-
getRight().toggle(isPressed);
97+
right.toggle(isPressed);
9898
}
9999
}
100100
if (isIgnoreInput() == true) {
101-
getUp().toggle(false);
102-
getDown().toggle(false);
103-
getLeft().toggle(false);
104-
getRight().toggle(false);
101+
up.toggle(false);
102+
down.toggle(false);
103+
left.toggle(false);
104+
right.toggle(false);
105105
}
106106
if (keyCode == KeyEvent.VK_M) {
107107
this.setPlayMusic(true);

‎src/com/redomar/game/Launcher.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.redomar.game;
2+
3+
import com.redomar.game.menu.Menu;
4+
5+
public class Launcher
6+
{
7+
public static void main(String[] args)
8+
{
9+
new Menu().start();
10+
}
11+
}

‎src/com/redomar/game/entities/Dummy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void tick() {
4040

4141

4242
setSwim(new Swim(level, (int) getX(), (int) getY()));
43-
swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
43+
swimType = swim.swimming(isSwimming, isMagma, isMuddy);
4444
isSwimming = swimType[0];
4545
isMagma = swimType[1];
4646
isMuddy = swimType[2];
@@ -77,7 +77,7 @@ public void render(Screen screen) {
7777
int yOffset = (int) getY() - modifier / 2 - 4;
7878

7979
if (isSwimming || isMagma || isMuddy) {
80-
swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
80+
swimColour = swim.waveCols(isSwimming, isMagma, isMuddy);
8181

8282
int waterColour = 0;
8383
yOffset += 4;

‎src/com/redomar/game/entities/Player.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void tick() {
103103
}
104104

105105
setSwim(new Swim(level, (int) getX(), (int) getY()));
106-
swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
106+
swimType = swim.swimming(isSwimming, isMagma, isMuddy);
107107
isSwimming = swimType[0];
108108
isMagma = swimType[1];
109109
isMuddy = swimType[2];
@@ -148,7 +148,7 @@ public void render(Screen screen) {
148148
}
149149

150150
if(isSwimming || isMagma || isMuddy){
151-
swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
151+
swimColour = swim.waveCols(isSwimming, isMagma, isMuddy);
152152

153153
int waterColour = 0;
154154
yOffset += 4;

‎src/com/redomar/game/entities/Vendor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void tick() {
4444
moveMob(xa, ya, this);
4545

4646
setSwim(new Swim(level, (int) getX(), (int) getY()));
47-
swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
47+
swimType = swim.swimming(isSwimming, isMagma, isMuddy);
4848
isSwimming = swimType[0];
4949
isMagma = swimType[1];
5050
isMuddy = swimType[2];
@@ -54,7 +54,7 @@ public void tick() {
5454
}
5555

5656
public void render(Screen screen) {
57-
setTime(getTime() + 1);
57+
setTime(time + 1);
5858
int xTile = 8;
5959
int yTile = 28;
6060
int walkingSpeed = 4;
@@ -81,7 +81,7 @@ public void render(Screen screen) {
8181
int yOffset = (int) getY() - modifier / 2 - 4;
8282

8383
if (isSwimming || isMagma || isMuddy) {
84-
swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
84+
swimColour = swim.waveCols(isSwimming, isMagma, isMuddy);
8585

8686
int waterColour = 0;
8787
yOffset += 4;

‎src/com/redomar/game/gfx/SpriteSheet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public SpriteSheet(String path) {
3030
this.setWidth(image.getWidth());
3131
this.height = image.getHeight();
3232

33-
pixels = image.getRGB(0, 0, getWidth(), height, null, 0, getWidth());
33+
pixels = image.getRGB(0, 0, width, height, null, 0, width);
3434

3535
for (int i = 0; i < pixels.length; i++) {
3636
pixels[i] = (pixels[i] & 0xff) / 64; // removes alpha (transparency)

0 commit comments

Comments
 (0)