Skip to content

Commit 39a34d4

Browse files
redomarredomar
committed
v1.8.1 - Backend Changes
2 parents ac0efd0 + 6c5ac01 commit 39a34d4

File tree

19 files changed

+188
-127
lines changed

19 files changed

+188
-127
lines changed

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
JavaGame Alpha v1.8
1+
JavaGame Alpha v1.8.1
22
===================
33

44
#####What is JavaGame?
@@ -34,7 +34,4 @@ Watch this video [here](http://youtu.be/_3nCgac3KKM) or checkout the [GitHub Pag
3434
* Make the changes in the /src folder
3535
* Commit your changes (```git commit -m "Change Title"```)
3636
* Push to the branch (```git push origin my_branch```)
37-
* Open a [Pull Request](https://github.com/redomar/JavaGame/pull/new/master)
38-
39-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/redomar/javagame/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
40-
[![Ohloh Stats](https://www.ohloh.net/p/JavaGame/widgets/project_thin_badge.gif)](https://www.ohloh.net/p/JavaGame)
37+
* Open a [Pull Request](https://github.com/redomar/JavaGame/pull/new/master)

‎jar/javagame.jar‎

6.16 KB
Binary file not shown.

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

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.redomar.game.lib.Font;
2626
import com.redomar.game.lib.Music;
2727
import com.redomar.game.lib.Time;
28-
import com.redomar.game.menu.Menu;
2928
import com.redomar.game.net.GameClient;
3029
import com.redomar.game.net.GameServer;
3130
import com.redomar.game.net.packets.Packet00Login;
@@ -36,7 +35,7 @@ public class Game extends Canvas implements Runnable {
3635

3736
// Setting the size and name of the frame/canvas
3837
private static final long serialVersionUID = 1L;
39-
private static final String game_Version = "v1.8 Alpha";
38+
private static final String game_Version = "v1.8.1 Alpha";
4039
private static final int WIDTH = 160;
4140
private static final int HEIGHT = (WIDTH / 3 * 2);
4241
private static final int SCALE = 3;
@@ -57,7 +56,7 @@ public class Game extends Canvas implements Runnable {
5756
private static int steps;
5857
private static boolean devMode;
5958
private static boolean closingMode;
60-
59+
6160
private static JFrame frame;
6261

6362
private static boolean running = false;
@@ -90,10 +89,10 @@ public class Game extends Canvas implements Runnable {
9089
private GameServer socketServer;
9190
private Printing print = new Printing();
9291
private static InputContext context;
93-
92+
9493
/**
9594
* @author Redomar
96-
* @version Alpha 1.8
95+
* @version Alpha 1.8.1
9796
*/
9897
public Game() {
9998
context = InputContext.getInstance();
@@ -143,33 +142,34 @@ public void init() {
143142

144143
// socketClient.sendData("ping".getBytes());
145144
loginPacket.writeData(getSocketClient());
146-
147-
game.setVendor(new Vendor(getLevel(), "Vendor", 215, 215, 304, 543));
148-
getLevel().addEntity(getVendor());
145+
146+
game.setVendor(new Vendor(level, "Vendor", 215, 215, 304, 543));
147+
level.addEntity(getVendor());
149148
}
150149

151150
public void setMap(String Map_str) {
152151
setLevel(new LevelHandler(Map_str));
153-
if(alternateCols[0]){
152+
if (alternateCols[0]) {
154153
Game.setShirtCol(240);
155154
}
156-
if(!alternateCols[0]){
155+
if (!alternateCols[0]) {
157156
Game.setShirtCol(111);
158157
}
159-
if(alternateCols[1]){
158+
if (alternateCols[1]) {
160159
Game.setFaceCol(310);
161160
}
162-
if(!alternateCols[1]){
161+
if (!alternateCols[1]) {
163162
Game.setFaceCol(543);
164163
}
165-
setPlayer(new PlayerMP(getLevel(), 100, 100, input,
164+
setPlayer(new PlayerMP(level, 100, 100, input,
166165
getJdata_UserName(), null, -1, shirtCol, faceCol));
167166
level.addEntity(player);
168167
}
169168

170169
public static void npcSpawn() {
171170
if (isNpc() == true) {
172-
game.setDummy(new Dummy(Game.getLevel(), "Dummy", 100, 150, 500, 543));
171+
game.setDummy(new Dummy(game.level, "Dummy", 100, 150, 500,
172+
543));
173173
game.level.addEntity(Game.getDummy());
174174
}
175175
}
@@ -235,7 +235,10 @@ public void run() {
235235

236236
if (System.currentTimeMillis() - lastTimer >= 1000) {
237237
lastTimer += 1000;
238-
getFrame().setTitle("JavaGame - Version "+WordUtils.capitalize(game_Version).substring(1, game_Version.length()));
238+
getFrame().setTitle(
239+
"JavaGame - Version "
240+
+ WordUtils.capitalize(game_Version).substring(
241+
1, game_Version.length()));
239242
fps = frames;
240243
tps = ticks;
241244
frames = 0;
@@ -247,7 +250,7 @@ public void run() {
247250

248251
public void tick() {
249252
setTickCount(getTickCount() + 1);
250-
getLevel().tick();
253+
level.tick();
251254
}
252255

253256
public void render() {
@@ -260,7 +263,7 @@ public void render() {
260263
int xOffset = (int) getPlayer().getX() - (screen.getWidth() / 2);
261264
int yOffset = (int) getPlayer().getY() - (screen.getHeight() / 2);
262265

263-
getLevel().renderTiles(screen, xOffset, yOffset);
266+
level.renderTiles(screen, xOffset, yOffset);
264267

265268
/*
266269
* for (int x = 0; x < level.width; x++) { int colour = Colours.get(-1,
@@ -269,8 +272,8 @@ public void render() {
269272
* colour, 1); }
270273
*/
271274

272-
getLevel().renderEntities(screen);
273-
getLevel().renderProjectileEntities(screen);
275+
level.renderEntities(screen);
276+
level.renderProjectileEntities(screen);
274277

275278
for (int y = 0; y < screen.getHeight(); y++) {
276279
for (int x = 0; x < screen.getWidth(); x++) {
@@ -306,19 +309,18 @@ public void render() {
306309
print.print("Teleported into new world", PrintTypes.GAME);
307310
if (getMap() == 1) {
308311
setMap("/levels/water_level.png");
309-
if(getDummy()!=null){ // Gave nullPointerException(); upon entering new world.
310-
getLevel().removeEntity(getDummy());
312+
if (getDummy() != null) { // Gave nullPointerException(); upon
313+
// entering new world.
314+
level.removeEntity(getDummy());
311315
setNpc(false);
312316
}
313-
getLevel().removeEntity(getVendor());
317+
level.removeEntity(getVendor());
314318
setMap(2);
315319
} else if (getMap() == 2) {
316320
setMap("/levels/custom_level.png");
317-
if(getDummy()!=null){
318-
getLevel().removeEntity(getDummy());
319-
setNpc(false);
320-
}
321-
getLevel().addEntity(getVendor());
321+
level.removeEntity(getDummy());
322+
setNpc(false);
323+
level.addEntity(getVendor());
322324
setMap(1);
323325
}
324326
changeLevel = false;
@@ -337,14 +339,14 @@ public void render() {
337339
+ WordUtils.capitalizeFully(player
338340
.getSantizedUsername()), 3, getHeight() - 17);
339341
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);
342+
343+
if (context.getLocale().getCountry().equals("BE")
344+
|| context.getLocale().getCountry().equals("FR")) {
345+
g.drawString("Press A to quit", (getWidth() / 2)
346+
- ("Press A to quit".length() * 3), getHeight() - 17);
347+
} else {
348+
g.drawString("Press Q to quit", (getWidth() / 2)
349+
- ("Press Q to quit".length() * 3), getHeight() - 17);
348350
}
349351
g.setColor(Color.YELLOW);
350352
g.drawString(time.getTime(), (getWidth() - 58), (getHeight() - 3));
@@ -383,33 +385,34 @@ public void render() {
383385
}
384386

385387
private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
386-
if (TerminalMode == true){
388+
if (TerminalMode == true) {
387389
g.setColor(Color.CYAN);
388390
g.drawString("JavaGame Stats", 0, 10);
389391
g.drawString("FPS/TPS: " + fps + "/" + tps, 0, 25);
390392
if ((player.getNumSteps() & 15) == 15) {
391393
steps += 1;
392394
}
393395
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);
396+
g.drawString(
397+
"NPC: " + WordUtils.capitalize(String.valueOf(isNpc())), 0,
398+
55);
399+
g.drawString("Mouse: " + getMouse().getX() + "x |"
400+
+ getMouse().getY() + "y", 0, 70);
401+
if (getMouse().getButton() != -1)
402+
g.drawString("Button: " + getMouse().getButton(), 0, 85);
397403
g.setColor(Color.CYAN);
398-
g.fillRect(getMouse().getX()-12, getMouse().getY()-12, 24, 24);
404+
g.fillRect(getMouse().getX() - 12, getMouse().getY() - 12, 24, 24);
399405
}
400-
if (TerminalQuit == true){
406+
if (TerminalQuit == true) {
401407
g.setColor(Color.BLACK);
402408
g.fillRect(0, 0, getWidth(), getHeight());
403409
g.setColor(Color.RED);
404-
g.drawString("Shutting down the Game", (getWidth()/2)-70, (getHeight()/2)-8);
410+
g.drawString("Shutting down the Game", (getWidth() / 2) - 70,
411+
(getHeight() / 2) - 8);
405412
g.dispose();
406413
}
407414
}
408415

409-
public static void main(String[] args) {
410-
new Menu().start();
411-
}
412-
413416
public static JFrame getFrame() {
414417
return Game.frame;
415418
}
@@ -581,12 +584,12 @@ public static boolean[] getAlternateCols() {
581584
public static void setAlternateCols(boolean[] alternateCols) {
582585
Game.alternateCols = alternateCols;
583586
}
584-
585-
public static void setAternateColsR(boolean alternateCols){
587+
588+
public static void setAternateColsR(boolean alternateCols) {
586589
Game.alternateCols[1] = alternateCols;
587590
}
588-
589-
public static void setAternateColsS(boolean alternateCols){
591+
592+
public static void setAternateColsS(boolean alternateCols) {
590593
Game.alternateCols[0] = alternateCols;
591594
}
592595

‎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/UML.ucls renamed to src/com/redomar/game/UML.ucls

File renamed without changes.

‎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)