Skip to content

Commit

Permalink
Client: More minor code quality improvements
Browse files Browse the repository at this point in the history
- Use integers instead of chars in math operations
- Use more magic constants where possible
- Remove more unused imports
- Remove useless JavaDocs that just say "Playforia"
- Remove some explicit uses of UTF-8 enconding. This is the default
  encoding since Java 18.
- Remove unused LobbyRef class
  • Loading branch information
StenAL committed Aug 16, 2024
1 parent e3b9a34 commit 04db063
Show file tree
Hide file tree
Showing 27 changed files with 16 additions and 128 deletions.
4 changes: 2 additions & 2 deletions client/src/main/java/agolf/game/GameBackgroundCanvas.java
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,10 @@ private int method129(int var1, int var2, double var3) {
return var1;
} else {
int var7 = (var1 & 16711680) >> 16;
int var8 = (var1 & '\uff00') >> 8;
int var8 = (var1 & 65280) >> 8;
int var9 = var1 & 255;
int var10 = (var2 & 16711680) >> 16;
int var11 = (var2 & '\uff00') >> 8;
int var11 = (var2 & 65280) >> 8;
int var12 = var2 & 255;
int var13 = var10 - var7;
int var14 = var11 - var8;
Expand Down
8 changes: 4 additions & 4 deletions client/src/main/java/agolf/game/GameCanvas.java
Original file line number Diff line number Diff line change
Expand Up @@ -967,8 +967,8 @@ private void doStroke(int playerId, boolean isLocalPlayer, int mouseX, int mouse
double speed = temp / 6.5D;
speed *= speed;
if (!this.norandom) {
this.speedX[playerId] += speed * ((double) (this.rngSeed.next() % '\uc351') / 100000.0D - 0.25D);
this.speedY[playerId] += speed * ((double) (this.rngSeed.next() % '\uc351') / 100000.0D - 0.25D);
this.speedX[playerId] += speed * ((double) (this.rngSeed.next() % 50001) / 100000.0D - 0.25D);
this.speedY[playerId] += speed * ((double) (this.rngSeed.next() % 50001) / 100000.0D - 0.25D);
}
this.isLocalPlayer = isLocalPlayer;
this.gameState = 2;
Expand Down Expand Up @@ -1011,8 +1011,8 @@ private void doHackedStroke(int playerId, boolean isLocalPlayer, int mouseX, int
var7 = Math.sqrt(temp_aDoubleArray2828[playerId] * temp_aDoubleArray2828[playerId] + temp_aDoubleArray2829[playerId] * temp_aDoubleArray2829[playerId]);
double var9 = var7 / 6.5D;
var9 *= var9;
temp_aDoubleArray2828[playerId] += var9 * ((double) (temp_aSeed_2836.next() % '\uc351') / 100000.0D - 0.25D);
temp_aDoubleArray2829[playerId] += var9 * ((double) (temp_aSeed_2836.next() % '\uc351') / 100000.0D - 0.25D);
temp_aDoubleArray2828[playerId] += var9 * ((double) (temp_aSeed_2836.next() % 50001) / 100000.0D - 0.25D);
temp_aDoubleArray2829[playerId] += var9 * ((double) (temp_aSeed_2836.next() % 50001) / 100000.0D - 0.25D);
temp_aBoolean2832 = isLocalPlayer;
//this.gameState = 2;
temp_aBoolean2843 = false;
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/com/aapeli/applet/AdCanvasText.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private AdCanvasText(int var1, int var2, int var3, int var4, Color var5, Color v
this.aColor1306 = var5;
this.aColor1307 = var6;
this.aString1308 = var9;
this.fontDialog = new Font("Dialog", bold ? 1 : 0, size);
this.fontDialog = new Font("Dialog", bold ? Font.BOLD : Font.PLAIN, size);
this.anInt1310 = -1;
if (var3 > 0) {
this.anInt1310 = 1;
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/com/aapeli/bigtext/BigText.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private void method1552(int var1, int var2, int var3, double var4, double var6,
}

private int method1553(int var1, int var2, double var3, double var5, double var7) {
return (var2 << 24) + ((int) ((double) ((var1 & 16711680) >> 16) * var3) << 16) + ((int) ((double) ((var1 & '\uff00') >> 8) * var5) << 8) + (int) ((double) (var1 & 255) * var7);
return (var2 << 24) + ((int) ((double) ((var1 & 16711680) >> 16) * var3) << 16) + ((int) ((double) ((var1 & 65280) >> 8) * var5) << 8) + (int) ((double) (var1 & 255) * var7);
}

private void method1554(String var1, Color var2, int var3, Component var4) {
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/com/aapeli/client/TextManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ private String method1728(long var1, int var3) {
var5 = false;
}

int var6 = var4.get(var5 ? 11 : 10);
int var6 = var4.get(var5 ? Calendar.HOUR_OF_DAY : Calendar.HOUR);
int var7 = var4.get(Calendar.MINUTE);
String var8 = "";
if (!var5) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package com.aapeli.colorgui;

/**
* Playforia
* 7.7.2013
*/
public interface MultiColorListListener {

public void mouseDoubleClicked(MultiColorListItem clickedItem);
void mouseDoubleClicked(MultiColorListItem clickedItem);
}
1 change: 0 additions & 1 deletion client/src/main/java/com/aapeli/colorgui/RoundButton.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.image.ImageObserver;
import java.util.Enumeration;
import java.util.Vector;

Expand Down
10 changes: 2 additions & 8 deletions client/src/main/java/com/aapeli/connection/Connection.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public final class Connection implements Runnable {
public static final int STATE_DISCONNECTED = 4;

/* Other Constants */
private static final String encoding = "UTF-8";
public static final int CIPHER_MAGIC_DEFAULT = 4;

private AApplet gameApplet;
Expand Down Expand Up @@ -199,13 +198,8 @@ private boolean connect() {

InputStreamReader reader;
OutputStreamWriter writer;
try {
reader = new InputStreamReader(in, encoding);
writer = new OutputStreamWriter(out, encoding);
} catch (UnsupportedEncodingException ex) {
reader = new InputStreamReader(in);
writer = new OutputStreamWriter(out);
}
reader = new InputStreamReader(in);
writer = new OutputStreamWriter(out);

this.sockIn = new BufferedReader(reader);
this.sockOut = new BufferedWriter(writer);
Expand Down
4 changes: 2 additions & 2 deletions client/src/main/java/com/aapeli/tools/Tools.java
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ public static String arrayToString(Object[] var0, char var1) {
}

private static void method1875(StringBuffer var0, int var1) {
int var2 = var1 / '\uea60';
var1 -= var2 * '\uea60';
int var2 = var1 / 60000;
var1 -= var2 * 60000;
int var3 = var1 / 1000;
int var4 = var1 - var3 * 1000;
if (var2 < 10) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.net.Socket;
import java.util.Vector;

Expand All @@ -20,7 +19,6 @@ public final class Connection implements Runnable {
public static final int DCR_RETRYFAIL = 3;
public static final int DCR_VERSION = 4;
public static final int DCR_HANDLEFAILED = 5;
private static final String aString1608 = "UTF-8";
private ConnListener aConnListener1611;
private GameCrypto aGameCrypto_1612;
private int anInt1613;
Expand Down Expand Up @@ -161,13 +159,8 @@ private boolean method1776() {

InputStreamReader var5;
OutputStreamWriter var6;
try {
var5 = new InputStreamReader(var3, "UTF-8");
var6 = new OutputStreamWriter(var4, "UTF-8");
} catch (UnsupportedEncodingException var8) {
var5 = new InputStreamReader(var3);
var6 = new OutputStreamWriter(var4);
}
var5 = new InputStreamReader(var3);
var6 = new OutputStreamWriter(var4);

this.in = new BufferedReader(var5);
this.out = new BufferedWriter(var6);
Expand Down
4 changes: 0 additions & 4 deletions server/src/main/java/org/moparforia/server/game/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
import java.util.ArrayList;
import java.util.regex.Matcher;

/**
* Playforia
* 11.6.2013
*/
public abstract class Game extends PlayerCollection {

protected final int gameId;
Expand Down
4 changes: 0 additions & 4 deletions server/src/main/java/org/moparforia/server/game/GameType.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.moparforia.server.game;

/**
* Playforia
* 24.6.2013
*/
public enum GameType {

GOLF(35), GOLF2(14), CANNONS(24), POOL(41);//, DRAW(16)
Expand Down
4 changes: 0 additions & 4 deletions server/src/main/java/org/moparforia/server/game/Lobby.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
import java.util.ArrayList;
import java.util.HashMap;

/**
* Playforia
* 11.6.2013
*/
public class Lobby extends PlayerCollection {

public static final int PART_REASON_STARTED_SP = 1; // todo: enum this ?
Expand Down
30 changes: 0 additions & 30 deletions server/src/main/java/org/moparforia/server/game/LobbyRef.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.moparforia.server.net;

/**
* Playforia
* 11.6.2013
*/
public enum PacketType {
DATA, STRING, COMMAND, NONE
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 13.6.2013
*/
public class ChatHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 12.6.2013
*/
public class GameHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 13.6.2013
*/
public class LobbyCreateSinglePlayerHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 24.6.2013
*/
public class LobbyDualplayerHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 12.6.2013
*/
public class LobbyHandler implements PacketHandler {
private static final TrackManager manager = FileSystemTrackManager.getInstance();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 11.6.2013
*/
public class LobbySelectHandler implements PacketHandler {

public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 11.6.2013
*/
public class LoginHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 11.6.2013
*/
public class LoginTypeHandler implements PacketHandler {
@Override
public PacketType getType() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Playforia
* 13.6.2013
*/
public class TrackTestLoginHandler implements PacketHandler {
Pattern namePattern;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.moparforia.shared.tracks;

/**
* Playforia
* 18.6.2013
*/
public enum TrackCategory {

UNKNOWN("?", -1),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

import java.util.List;

/**
* Playforia
* 18.6.2013
*/
public class TrackSet {

private String name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.moparforia.shared.tracks;

/**
* Playforia
* 18.6.2013
*/
public enum TrackSetDifficulty {

EASY(1), MEDIUM(2), HARD(3);
Expand Down

0 comments on commit 04db063

Please sign in to comment.