diff --git a/client/src/agolf/AGolf.java b/client/src/main/java/agolf/AGolf.java similarity index 100% rename from client/src/agolf/AGolf.java rename to client/src/main/java/agolf/AGolf.java diff --git a/client/src/agolf/Conn.java b/client/src/main/java/agolf/Conn.java similarity index 100% rename from client/src/agolf/Conn.java rename to client/src/main/java/agolf/Conn.java diff --git a/client/src/agolf/GameApplet.java b/client/src/main/java/agolf/GameApplet.java similarity index 99% rename from client/src/agolf/GameApplet.java rename to client/src/main/java/agolf/GameApplet.java index 5804d24d..8d9adb7d 100644 --- a/client/src/agolf/GameApplet.java +++ b/client/src/main/java/agolf/GameApplet.java @@ -86,7 +86,7 @@ public void createImages() { public void connectToServer() { this.gameContainer.connection = new Conn(this.gameContainer); if (!this.gameContainer.connection.method1158()) { - this.setEndState(AApplet.END_ERROR_CONNECTION); + this.setEndState(END_ERROR_CONNECTION); } } @@ -265,7 +265,7 @@ public void gameFinished(boolean var1) { } public void quit(String from) { - this.setEndState(AApplet.END_QUIT); + this.setEndState(END_QUIT); this.gameContainer.connection.writeData((from != null ? from + "\t" : "") + "quit"); this.setGameState(5); } diff --git a/client/src/agolf/GameContainer.java b/client/src/main/java/agolf/GameContainer.java similarity index 100% rename from client/src/agolf/GameContainer.java rename to client/src/main/java/agolf/GameContainer.java diff --git a/client/src/agolf/LobbySelectPanel.java b/client/src/main/java/agolf/LobbySelectPanel.java similarity index 100% rename from client/src/agolf/LobbySelectPanel.java rename to client/src/main/java/agolf/LobbySelectPanel.java diff --git a/client/src/agolf/LobbySelectRNOPspammer.java b/client/src/main/java/agolf/LobbySelectRNOPspammer.java similarity index 100% rename from client/src/agolf/LobbySelectRNOPspammer.java rename to client/src/main/java/agolf/LobbySelectRNOPspammer.java diff --git a/client/src/agolf/Seed.java b/client/src/main/java/agolf/Seed.java similarity index 100% rename from client/src/agolf/Seed.java rename to client/src/main/java/agolf/Seed.java diff --git a/client/src/agolf/SpriteManager.java b/client/src/main/java/agolf/SpriteManager.java similarity index 100% rename from client/src/agolf/SpriteManager.java rename to client/src/main/java/agolf/SpriteManager.java diff --git a/client/src/agolf/SynchronizedBool.java b/client/src/main/java/agolf/SynchronizedBool.java similarity index 100% rename from client/src/agolf/SynchronizedBool.java rename to client/src/main/java/agolf/SynchronizedBool.java diff --git a/client/src/agolf/SynchronizedInteger.java b/client/src/main/java/agolf/SynchronizedInteger.java similarity index 100% rename from client/src/agolf/SynchronizedInteger.java rename to client/src/main/java/agolf/SynchronizedInteger.java diff --git a/client/src/agolf/TrackCollection.java b/client/src/main/java/agolf/TrackCollection.java similarity index 100% rename from client/src/agolf/TrackCollection.java rename to client/src/main/java/agolf/TrackCollection.java diff --git a/client/src/agolf/TrackTestLoginPanel.java b/client/src/main/java/agolf/TrackTestLoginPanel.java similarity index 100% rename from client/src/agolf/TrackTestLoginPanel.java rename to client/src/main/java/agolf/TrackTestLoginPanel.java diff --git a/client/src/agolf/game/ConfirmButton.java b/client/src/main/java/agolf/game/ConfirmButton.java similarity index 100% rename from client/src/agolf/game/ConfirmButton.java rename to client/src/main/java/agolf/game/ConfirmButton.java diff --git a/client/src/agolf/game/GameBackgroundCanvas.java b/client/src/main/java/agolf/game/GameBackgroundCanvas.java similarity index 100% rename from client/src/agolf/game/GameBackgroundCanvas.java rename to client/src/main/java/agolf/game/GameBackgroundCanvas.java diff --git a/client/src/agolf/game/GameCanvas.java b/client/src/main/java/agolf/game/GameCanvas.java similarity index 100% rename from client/src/agolf/game/GameCanvas.java rename to client/src/main/java/agolf/game/GameCanvas.java diff --git a/client/src/agolf/game/GameChatPanel.java b/client/src/main/java/agolf/game/GameChatPanel.java similarity index 100% rename from client/src/agolf/game/GameChatPanel.java rename to client/src/main/java/agolf/game/GameChatPanel.java diff --git a/client/src/agolf/game/GameControlPanel.java b/client/src/main/java/agolf/game/GameControlPanel.java similarity index 100% rename from client/src/agolf/game/GameControlPanel.java rename to client/src/main/java/agolf/game/GameControlPanel.java diff --git a/client/src/agolf/game/GamePanel.java b/client/src/main/java/agolf/game/GamePanel.java similarity index 100% rename from client/src/agolf/game/GamePanel.java rename to client/src/main/java/agolf/game/GamePanel.java diff --git a/client/src/agolf/game/GamePlayerInfoPanel.java b/client/src/main/java/agolf/game/GamePlayerInfoPanel.java similarity index 100% rename from client/src/agolf/game/GamePlayerInfoPanel.java rename to client/src/main/java/agolf/game/GamePlayerInfoPanel.java diff --git a/client/src/agolf/game/GamePlayerInfoPanelThread.java b/client/src/main/java/agolf/game/GamePlayerInfoPanelThread.java similarity index 100% rename from client/src/agolf/game/GamePlayerInfoPanelThread.java rename to client/src/main/java/agolf/game/GamePlayerInfoPanelThread.java diff --git a/client/src/agolf/game/GameTrackInfoPanel.java b/client/src/main/java/agolf/game/GameTrackInfoPanel.java similarity index 100% rename from client/src/agolf/game/GameTrackInfoPanel.java rename to client/src/main/java/agolf/game/GameTrackInfoPanel.java diff --git a/client/src/agolf/game/HackedShot.java b/client/src/main/java/agolf/game/HackedShot.java similarity index 100% rename from client/src/agolf/game/HackedShot.java rename to client/src/main/java/agolf/game/HackedShot.java diff --git a/client/src/agolf/lobby/LobbyChatPanel.java b/client/src/main/java/agolf/lobby/LobbyChatPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyChatPanel.java rename to client/src/main/java/agolf/lobby/LobbyChatPanel.java diff --git a/client/src/agolf/lobby/LobbyControlPanel.java b/client/src/main/java/agolf/lobby/LobbyControlPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyControlPanel.java rename to client/src/main/java/agolf/lobby/LobbyControlPanel.java diff --git a/client/src/agolf/lobby/LobbyDualPlayerPanel.java b/client/src/main/java/agolf/lobby/LobbyDualPlayerPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyDualPlayerPanel.java rename to client/src/main/java/agolf/lobby/LobbyDualPlayerPanel.java diff --git a/client/src/agolf/lobby/LobbyGamePasswordPanel.java b/client/src/main/java/agolf/lobby/LobbyGamePasswordPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyGamePasswordPanel.java rename to client/src/main/java/agolf/lobby/LobbyGamePasswordPanel.java diff --git a/client/src/agolf/lobby/LobbyMultiPlayerPanel.java b/client/src/main/java/agolf/lobby/LobbyMultiPlayerPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyMultiPlayerPanel.java rename to client/src/main/java/agolf/lobby/LobbyMultiPlayerPanel.java diff --git a/client/src/agolf/lobby/LobbyPanel.java b/client/src/main/java/agolf/lobby/LobbyPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyPanel.java rename to client/src/main/java/agolf/lobby/LobbyPanel.java diff --git a/client/src/agolf/lobby/LobbySinglePlayerPanel.java b/client/src/main/java/agolf/lobby/LobbySinglePlayerPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbySinglePlayerPanel.java rename to client/src/main/java/agolf/lobby/LobbySinglePlayerPanel.java diff --git a/client/src/agolf/lobby/LobbyTrackListAdminPanel.java b/client/src/main/java/agolf/lobby/LobbyTrackListAdminPanel.java similarity index 100% rename from client/src/agolf/lobby/LobbyTrackListAdminPanel.java rename to client/src/main/java/agolf/lobby/LobbyTrackListAdminPanel.java diff --git a/client/src/com/aapeli/applet/AApplet.java b/client/src/main/java/com/aapeli/applet/AApplet.java similarity index 99% rename from client/src/com/aapeli/applet/AApplet.java rename to client/src/main/java/com/aapeli/applet/AApplet.java index 12f06ea8..434810b5 100644 --- a/client/src/com/aapeli/applet/AApplet.java +++ b/client/src/main/java/com/aapeli/applet/AApplet.java @@ -22,6 +22,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.net.URL; +import java.util.Optional; public abstract class AApplet extends Applet implements Runnable, ActionListener, QuickTimerListener { diff --git a/client/src/com/aapeli/applet/AdCanvas.java b/client/src/main/java/com/aapeli/applet/AdCanvas.java similarity index 100% rename from client/src/com/aapeli/applet/AdCanvas.java rename to client/src/main/java/com/aapeli/applet/AdCanvas.java diff --git a/client/src/com/aapeli/applet/AdCanvasText.java b/client/src/main/java/com/aapeli/applet/AdCanvasText.java similarity index 100% rename from client/src/com/aapeli/applet/AdCanvasText.java rename to client/src/main/java/com/aapeli/applet/AdCanvasText.java diff --git a/client/src/com/aapeli/applet/ContentPanel.java b/client/src/main/java/com/aapeli/applet/ContentPanel.java similarity index 100% rename from client/src/com/aapeli/applet/ContentPanel.java rename to client/src/main/java/com/aapeli/applet/ContentPanel.java diff --git a/client/src/com/aapeli/applet/LoadingPanel.java b/client/src/main/java/com/aapeli/applet/LoadingPanel.java similarity index 100% rename from client/src/com/aapeli/applet/LoadingPanel.java rename to client/src/main/java/com/aapeli/applet/LoadingPanel.java diff --git a/client/src/com/aapeli/applet/RetryCanvas.java b/client/src/main/java/com/aapeli/applet/RetryCanvas.java similarity index 100% rename from client/src/com/aapeli/applet/RetryCanvas.java rename to client/src/main/java/com/aapeli/applet/RetryCanvas.java diff --git a/client/src/com/aapeli/bigtext/BigText.java b/client/src/main/java/com/aapeli/bigtext/BigText.java similarity index 100% rename from client/src/com/aapeli/bigtext/BigText.java rename to client/src/main/java/com/aapeli/bigtext/BigText.java diff --git a/client/src/com/aapeli/bigtext/MediumText.java b/client/src/main/java/com/aapeli/bigtext/MediumText.java similarity index 100% rename from client/src/com/aapeli/bigtext/MediumText.java rename to client/src/main/java/com/aapeli/bigtext/MediumText.java diff --git a/client/src/com/aapeli/client/ApajaGames.java b/client/src/main/java/com/aapeli/client/ApajaGames.java similarity index 100% rename from client/src/com/aapeli/client/ApajaGames.java rename to client/src/main/java/com/aapeli/client/ApajaGames.java diff --git a/client/src/com/aapeli/client/AutoPopups.java b/client/src/main/java/com/aapeli/client/AutoPopups.java similarity index 100% rename from client/src/com/aapeli/client/AutoPopups.java rename to client/src/main/java/com/aapeli/client/AutoPopups.java diff --git a/client/src/com/aapeli/client/BadWordFilter.java b/client/src/main/java/com/aapeli/client/BadWordFilter.java similarity index 100% rename from client/src/com/aapeli/client/BadWordFilter.java rename to client/src/main/java/com/aapeli/client/BadWordFilter.java diff --git a/client/src/com/aapeli/client/Badge.java b/client/src/main/java/com/aapeli/client/Badge.java similarity index 100% rename from client/src/com/aapeli/client/Badge.java rename to client/src/main/java/com/aapeli/client/Badge.java diff --git a/client/src/com/aapeli/client/BadgeHandler.java b/client/src/main/java/com/aapeli/client/BadgeHandler.java similarity index 100% rename from client/src/com/aapeli/client/BadgeHandler.java rename to client/src/main/java/com/aapeli/client/BadgeHandler.java diff --git a/client/src/com/aapeli/client/CharacterImage.java b/client/src/main/java/com/aapeli/client/CharacterImage.java similarity index 100% rename from client/src/com/aapeli/client/CharacterImage.java rename to client/src/main/java/com/aapeli/client/CharacterImage.java diff --git a/client/src/com/aapeli/client/Class78.java b/client/src/main/java/com/aapeli/client/Class78.java similarity index 100% rename from client/src/com/aapeli/client/Class78.java rename to client/src/main/java/com/aapeli/client/Class78.java diff --git a/client/src/com/aapeli/client/Class79.java b/client/src/main/java/com/aapeli/client/Class79.java similarity index 100% rename from client/src/com/aapeli/client/Class79.java rename to client/src/main/java/com/aapeli/client/Class79.java diff --git a/client/src/com/aapeli/client/Class80.java b/client/src/main/java/com/aapeli/client/Class80.java similarity index 100% rename from client/src/com/aapeli/client/Class80.java rename to client/src/main/java/com/aapeli/client/Class80.java diff --git a/client/src/com/aapeli/client/Class81.java b/client/src/main/java/com/aapeli/client/Class81.java similarity index 100% rename from client/src/com/aapeli/client/Class81.java rename to client/src/main/java/com/aapeli/client/Class81.java diff --git a/client/src/com/aapeli/client/Class84.java b/client/src/main/java/com/aapeli/client/Class84.java similarity index 100% rename from client/src/com/aapeli/client/Class84.java rename to client/src/main/java/com/aapeli/client/Class84.java diff --git a/client/src/com/aapeli/client/Class85.java b/client/src/main/java/com/aapeli/client/Class85.java similarity index 100% rename from client/src/com/aapeli/client/Class85.java rename to client/src/main/java/com/aapeli/client/Class85.java diff --git a/client/src/com/aapeli/client/Class86.java b/client/src/main/java/com/aapeli/client/Class86.java similarity index 100% rename from client/src/com/aapeli/client/Class86.java rename to client/src/main/java/com/aapeli/client/Class86.java diff --git a/client/src/com/aapeli/client/Class87.java b/client/src/main/java/com/aapeli/client/Class87.java similarity index 100% rename from client/src/com/aapeli/client/Class87.java rename to client/src/main/java/com/aapeli/client/Class87.java diff --git a/client/src/com/aapeli/client/Class88.java b/client/src/main/java/com/aapeli/client/Class88.java similarity index 100% rename from client/src/com/aapeli/client/Class88.java rename to client/src/main/java/com/aapeli/client/Class88.java diff --git a/client/src/com/aapeli/client/Class89.java b/client/src/main/java/com/aapeli/client/Class89.java similarity index 100% rename from client/src/com/aapeli/client/Class89.java rename to client/src/main/java/com/aapeli/client/Class89.java diff --git a/client/src/com/aapeli/client/FileUtil.java b/client/src/main/java/com/aapeli/client/FileUtil.java similarity index 100% rename from client/src/com/aapeli/client/FileUtil.java rename to client/src/main/java/com/aapeli/client/FileUtil.java diff --git a/client/src/com/aapeli/client/FilterTextField.java b/client/src/main/java/com/aapeli/client/FilterTextField.java similarity index 100% rename from client/src/com/aapeli/client/FilterTextField.java rename to client/src/main/java/com/aapeli/client/FilterTextField.java diff --git a/client/src/com/aapeli/client/Frame_Sub3.java b/client/src/main/java/com/aapeli/client/Frame_Sub3.java similarity index 100% rename from client/src/com/aapeli/client/Frame_Sub3.java rename to client/src/main/java/com/aapeli/client/Frame_Sub3.java diff --git a/client/src/com/aapeli/client/Frame_Sub3_Sub1.java b/client/src/main/java/com/aapeli/client/Frame_Sub3_Sub1.java similarity index 100% rename from client/src/com/aapeli/client/Frame_Sub3_Sub1.java rename to client/src/main/java/com/aapeli/client/Frame_Sub3_Sub1.java diff --git a/client/src/com/aapeli/client/Frame_Sub3_Sub2.java b/client/src/main/java/com/aapeli/client/Frame_Sub3_Sub2.java similarity index 100% rename from client/src/com/aapeli/client/Frame_Sub3_Sub2.java rename to client/src/main/java/com/aapeli/client/Frame_Sub3_Sub2.java diff --git a/client/src/com/aapeli/client/Frame_Sub3_Sub3.java b/client/src/main/java/com/aapeli/client/Frame_Sub3_Sub3.java similarity index 100% rename from client/src/com/aapeli/client/Frame_Sub3_Sub3.java rename to client/src/main/java/com/aapeli/client/Frame_Sub3_Sub3.java diff --git a/client/src/com/aapeli/client/HtmlText.java b/client/src/main/java/com/aapeli/client/HtmlText.java similarity index 100% rename from client/src/com/aapeli/client/HtmlText.java rename to client/src/main/java/com/aapeli/client/HtmlText.java diff --git a/client/src/com/aapeli/client/IPanel.java b/client/src/main/java/com/aapeli/client/IPanel.java similarity index 100% rename from client/src/com/aapeli/client/IPanel.java rename to client/src/main/java/com/aapeli/client/IPanel.java diff --git a/client/src/com/aapeli/client/IPanel_Sub40.java b/client/src/main/java/com/aapeli/client/IPanel_Sub40.java similarity index 100% rename from client/src/com/aapeli/client/IPanel_Sub40.java rename to client/src/main/java/com/aapeli/client/IPanel_Sub40.java diff --git a/client/src/com/aapeli/client/IPanel_Sub41.java b/client/src/main/java/com/aapeli/client/IPanel_Sub41.java similarity index 100% rename from client/src/com/aapeli/client/IPanel_Sub41.java rename to client/src/main/java/com/aapeli/client/IPanel_Sub41.java diff --git a/client/src/com/aapeli/client/ImageManager.java b/client/src/main/java/com/aapeli/client/ImageManager.java similarity index 53% rename from client/src/com/aapeli/client/ImageManager.java rename to client/src/main/java/com/aapeli/client/ImageManager.java index 8e328ce7..ca113bac 100644 --- a/client/src/com/aapeli/client/ImageManager.java +++ b/client/src/main/java/com/aapeli/client/ImageManager.java @@ -5,74 +5,57 @@ import java.applet.Applet; import java.awt.*; -import java.awt.image.ImageObserver; import java.awt.image.MemoryImageSource; import java.awt.image.PixelGrabber; -import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.util.Enumeration; import java.util.Hashtable; public final class ImageManager { private Applet applet; - private URL codebaseURL; - private String[][] imageAliases; - private Hashtable aHashtable1357; - private Hashtable imagesTable; + private Hashtable imageAliases; private boolean validImageDir; - private boolean isDebug; - private ImageTracker imageTracker; + private final boolean isDebug; + private final ImageTracker imageTracker; - public ImageManager(Applet var1) { - this(var1, "picture/", true); + public ImageManager(Applet applet) { + this(applet, "src/main/resources/picture/", true); } - public ImageManager(Applet var1, boolean var2) { - this(var1, "picture/", var2); + public ImageManager(Applet applet, boolean isDebug) { + this(applet, "src/main/resources/picture/", isDebug); } - public ImageManager(Applet var1, String var2) { - this(var1, var2, true); + public ImageManager(Applet applet, String imageDir) { + this(applet, imageDir, true); } public ImageManager(Applet applet, String imageDir, boolean isDebug) { this.applet = applet; this.isDebug = isDebug; + + // TODO: Remove this code if it doesn't cause any problems in a few releases, I rewritten the functionality this.validImageDir = true; if (imageDir != null && imageDir.length() > 0) { this.validImageDir = false; } - String host = applet.getCodeBase().getHost(); - String URL = applet.getCodeBase().toString().replace("http://" + host, "res"); // todo: Load from res folder in classpath - try { - this.codebaseURL = new File(URL).toURI().toURL(); - } catch (Exception e) { - e.printStackTrace(); - } - - - if (!this.validImageDir) { - try { - this.codebaseURL = new URL(this.codebaseURL, imageDir); - } catch (MalformedURLException var5) { - ; - } - } - this.aHashtable1357 = new Hashtable(); - this.imagesTable = new Hashtable(); + this.imageAliases = new Hashtable<>(); this.imageTracker = new ImageTracker(applet, isDebug); } - public void setImageAliases(String[][] var1) { - this.imageAliases = var1; + public void setImageAliases(String[][] imageAliases) { + if (imageAliases != null) { + for (String[] aliases : imageAliases) { + this.imageAliases.put(aliases[0], aliases[1]); + } + } } public String defineImage(String var1) { - return this.defineImage(this.method1596(var1), var1); + return this.defineImage(this.removeExtension(var1), var1); } public String defineImage(String imageAlias, String imageFileName) { @@ -80,24 +63,13 @@ public String defineImage(String imageAlias, String imageFileName) { System.out.println("ImageManager.defineImage(\"" + imageAlias + "\",\"" + imageFileName + "\")"); } - /* - URL url = codebaseURL; - try { - url = new URL(codebaseURL, method1597(imageFileName)); - } catch (Exception ex) { - } - Image var3 = Toolkit.getDefaultToolkit().createImage(url); - */ - - - //Image var3 = Toolkit.getDefaultToolkit().getImage("AGolf/picture/"+getClass().getResource(method1597(imageFileName))); - Image var3 = Toolkit.getDefaultToolkit().createImage(this.getClass().getResource("/AGolf/picture/"+method1597(imageFileName))); + Image var3 = Toolkit.getDefaultToolkit().createImage(this.getClass().getResource("/picture/agolf/" +getAlias(imageFileName))); this.imageTracker.registerImage(imageAlias, var3); return imageAlias; } public String defineSharedImage(String var1) { - return defineSharedImage(method1596(var1), var1); + return defineSharedImage(removeExtension(var1), var1); } public String defineSharedImage(String imageAlias, String imageFileName) { @@ -105,7 +77,7 @@ public String defineSharedImage(String imageAlias, String imageFileName) { System.out.println("ImageManager.defineSharedImage(\"" + imageAlias + "\",\"" + imageFileName + "\")"); } - Image var3 = Toolkit.getDefaultToolkit().createImage(this.getClass().getResource("/Shared/picture/"+method1597(imageFileName))); + Image var3 = Toolkit.getDefaultToolkit().createImage(this.getClass().getResource("/picture/shared/" +getAlias(imageFileName))); this.imageTracker.method1624(imageAlias, var3); return imageAlias; } @@ -114,14 +86,6 @@ public void unDefineImage(String var1) { this.imageTracker.method1636(var1); } - public void defineAlias(String var1, String var2) { - if (this.isDebug) { - System.out.println("ImageManager.defineAlias(\"" + var1 + "\",\"" + var2 + "\")"); - } - - this.aHashtable1357.put(var1, var2); - } - public void startLoadingImages() { this.imageTracker.method1626(); } @@ -177,7 +141,7 @@ public Image getShared(String var1) { } public Image getShared(String var1, boolean var2) { - String var3 = this.method1596(var1); + String var3 = this.removeExtension(var1); Image var4 = this.imageTracker.method1631(var3); if (var4 != null) { return var4; @@ -241,7 +205,7 @@ public int[] getPixels(Image var1, int var2, int var3, int var4, int var5) { } public Image createImage(int[] var1, int var2, int var3) { - return this.createImage(var1, var2, var3, (Component) null); + return this.createImage(var1, var2, var3, null); } public Image createImage(int[] var1, int var2, int var3, Component var4) { @@ -249,9 +213,9 @@ public Image createImage(int[] var1, int var2, int var3, Component var4) { var4 = this.applet; } - Image var5 = ((Component) var4).createImage(new MemoryImageSource(var2, var3, var1, 0, var2)); + Image var5 = var4.createImage(new MemoryImageSource(var2, var3, var1, 0, var2)); - while (!((Component) var4).prepareImage(var5, (ImageObserver) var4)) { + while (!var4.prepareImage(var5, var4)) { Tools.sleep(20L); } @@ -296,97 +260,6 @@ public Image[][] separateImages(Image var1, int var2, int var3) { return var10; } - public Image[][] separateImages(String var1, int var2, int var3) { - String var4 = var1 + ":" + var2 + "*" + var3; - Hashtable var6 = this.imagesTable; - synchronized (this.imagesTable) { - Image[][] var5 = (Image[][]) ((Image[][]) this.imagesTable.get(var4)); - if (var5 == null) { - Image var7 = this.getImage(var1); - this.unDefineImage(var1); - var5 = this.separateImages(var7, var2, var3); - this.imagesTable.put(var4, var5); - } - - return var5; - } - } - - public Image[] separateImages(String var1, int var2) { - String var3 = var1 + ":" + var2; - Hashtable var5 = this.imagesTable; - synchronized (this.imagesTable) { - Image[] var4 = (Image[]) ((Image[]) this.imagesTable.get(var3)); - if (var4 == null) { - Image var6 = this.getImage(var1); - this.unDefineImage(var1); - var4 = this.separateImages(var6, var2, 1)[0]; - this.imagesTable.put(var3, var4); - } - - return var4; - } - } - - public Image setBrightness(Image var1, double var2) { - if (var2 == 0.0D) { - return var1; - } else { - int var4 = this.getWidth(var1); - int var5 = this.getHeight(var1); - int[] var6 = this.getPixels(var1, var4, var5); - return this.createImage(this.setBrightness(var6, var2), var4, var5); - } - } - - public int[] setBrightness(int[] var1, double var2) { - int var4 = var1.length; - int[] var8 = new int[var4]; - - for (int var9 = 0; var9 < var4; ++var9) { - int var5 = (var1[var9] & 16711680) >> 16; - int var6 = (var1[var9] & '\uff00') >> 8; - int var7 = var1[var9] & 255; - if (var2 > 0.0D) { - var5 = (int) ((double) var5 + (255.0D - (double) var5) * var2 + 0.5D); - var6 = (int) ((double) var6 + (255.0D - (double) var6) * var2 + 0.5D); - var7 = (int) ((double) var7 + (255.0D - (double) var7) * var2 + 0.5D); - } else { - var5 = (int) ((double) var5 + (double) var5 * var2 + 0.5D); - var6 = (int) ((double) var6 + (double) var6 * var2 + 0.5D); - var7 = (int) ((double) var7 + (double) var7 * var2 + 0.5D); - } - - var8[var9] = (int) (((long) var1[var9] & 4278190080L) + (long) (var5 << 16) + (long) (var6 << 8) + (long) var7); - } - - return var8; - } - - public Image setTransparency(Image var1, double var2) { - int var4 = this.getWidth(var1); - int var5 = this.getHeight(var1); - int[] var6 = this.getPixels(var1, var4, var5); - return this.createImage(this.setTransparency(var6, var2), var4, var5); - } - - public int[] setTransparency(int[] var1, double var2) { - int var4 = var1.length; - int[] var5 = new int[var4]; - - for (int var9 = 0; var9 < var4; ++var9) { - long var6 = ((long) var1[var9] & 4278190080L) >> 24; - if (var6 == 0L) { - var5[var9] = var1[var9]; - } else { - int var8 = (int) ((double) var6 * var2 + 0.5D); - var5[var9] = (int) ((long) (var8 << 24) + ((long) var1[var9] & 16777215L)); - } - } - - return var5; - } - public Image getAlphaMultipliedImage(Image var1, double var2) { int var4 = this.getWidth(var1); int var5 = this.getHeight(var1); @@ -415,40 +288,8 @@ public int[] multiplyAlpha(int[] var1, double var2) { public void destroy() { this.imageTracker.removeAllImageResources(); - Enumeration var1 = this.imagesTable.elements(); - - while (var1.hasMoreElements()) { - try { - Object var2 = var1.nextElement(); - int var4; - if (var2 instanceof Image[]) { - Image[] var7 = (Image[]) ((Image[]) var2); - - for (var4 = 0; var4 < var7.length; ++var4) { - var7[var4].flush(); - var7[var4] = null; - } - } else if (var2 instanceof Image[][]) { - Image[][] var3 = (Image[][]) ((Image[][]) var2); - - for (var4 = 0; var4 < var3.length; ++var4) { - for (int var5 = 0; var5 < var3[var4].length; ++var5) { - var3[var4][var5].flush(); - var3[var4][var5] = null; - } - } - } - } catch (Exception var6) { - ; - } - } - - this.imagesTable.clear(); - this.imagesTable = null; - this.aHashtable1357.clear(); - this.aHashtable1357 = null; - this.imageAliases = (String[][]) null; - this.codebaseURL = null; + this.imageAliases.clear(); + this.imageAliases = null; this.applet = null; } @@ -476,36 +317,11 @@ protected Image method1595(String var1) { return this.imageTracker.method1632(var1); } - private String method1596(String var1) { - int var2 = var1.lastIndexOf(46); - if (var2 == -1) { - var2 = var1.length(); - } - - if (this.validImageDir) { - return var1.substring(0, var2); - } else { - int var3 = var1.lastIndexOf(47); - return var1.substring(var3 + 1, var2); - } - } - - private String method1597(String var1) { - if (this.imageAliases != null) { - int var2 = this.imageAliases.length; - - for (int var3 = 0; var3 < var2; ++var3) { - if (var1.equals(this.imageAliases[var3][0])) { - return this.imageAliases[var3][1]; - } - } - } - - return var1; + private String removeExtension(String fileName) { + return fileName.substring(0, fileName.lastIndexOf('.')); } private String getAlias(String var1) { - String var2 = (String) ((String) this.aHashtable1357.get(var1)); - return var2 != null ? var2 : var1; + return this.imageAliases.getOrDefault(var1, var1); } } diff --git a/client/src/com/aapeli/client/ImageResource.java b/client/src/main/java/com/aapeli/client/ImageResource.java similarity index 100% rename from client/src/com/aapeli/client/ImageResource.java rename to client/src/main/java/com/aapeli/client/ImageResource.java diff --git a/client/src/com/aapeli/client/ImageTracker.java b/client/src/main/java/com/aapeli/client/ImageTracker.java similarity index 100% rename from client/src/com/aapeli/client/ImageTracker.java rename to client/src/main/java/com/aapeli/client/ImageTracker.java diff --git a/client/src/com/aapeli/client/InputTextField.java b/client/src/main/java/com/aapeli/client/InputTextField.java similarity index 100% rename from client/src/com/aapeli/client/InputTextField.java rename to client/src/main/java/com/aapeli/client/InputTextField.java diff --git a/client/src/com/aapeli/client/InputTextFieldListener.java b/client/src/main/java/com/aapeli/client/InputTextFieldListener.java similarity index 100% rename from client/src/com/aapeli/client/InputTextFieldListener.java rename to client/src/main/java/com/aapeli/client/InputTextFieldListener.java diff --git a/client/src/com/aapeli/client/KeyButton.java b/client/src/main/java/com/aapeli/client/KeyButton.java similarity index 100% rename from client/src/com/aapeli/client/KeyButton.java rename to client/src/main/java/com/aapeli/client/KeyButton.java diff --git a/client/src/com/aapeli/client/Match.java b/client/src/main/java/com/aapeli/client/Match.java similarity index 100% rename from client/src/com/aapeli/client/Match.java rename to client/src/main/java/com/aapeli/client/Match.java diff --git a/client/src/com/aapeli/client/NeedAccountFrame.java b/client/src/main/java/com/aapeli/client/NeedAccountFrame.java similarity index 100% rename from client/src/com/aapeli/client/NeedAccountFrame.java rename to client/src/main/java/com/aapeli/client/NeedAccountFrame.java diff --git a/client/src/com/aapeli/client/NickTextField.java b/client/src/main/java/com/aapeli/client/NickTextField.java similarity index 100% rename from client/src/com/aapeli/client/NickTextField.java rename to client/src/main/java/com/aapeli/client/NickTextField.java diff --git a/client/src/com/aapeli/client/Panel_Sub23.java b/client/src/main/java/com/aapeli/client/Panel_Sub23.java similarity index 100% rename from client/src/com/aapeli/client/Panel_Sub23.java rename to client/src/main/java/com/aapeli/client/Panel_Sub23.java diff --git a/client/src/com/aapeli/client/Panel_Sub24.java b/client/src/main/java/com/aapeli/client/Panel_Sub24.java similarity index 100% rename from client/src/com/aapeli/client/Panel_Sub24.java rename to client/src/main/java/com/aapeli/client/Panel_Sub24.java diff --git a/client/src/com/aapeli/client/Parameters.java b/client/src/main/java/com/aapeli/client/Parameters.java similarity index 100% rename from client/src/com/aapeli/client/Parameters.java rename to client/src/main/java/com/aapeli/client/Parameters.java diff --git a/client/src/com/aapeli/client/PersonalScore.java b/client/src/main/java/com/aapeli/client/PersonalScore.java similarity index 100% rename from client/src/com/aapeli/client/PersonalScore.java rename to client/src/main/java/com/aapeli/client/PersonalScore.java diff --git a/client/src/com/aapeli/client/PersonalScoreUnit.java b/client/src/main/java/com/aapeli/client/PersonalScoreUnit.java similarity index 100% rename from client/src/com/aapeli/client/PersonalScoreUnit.java rename to client/src/main/java/com/aapeli/client/PersonalScoreUnit.java diff --git a/client/src/com/aapeli/client/SoundManager.java b/client/src/main/java/com/aapeli/client/SoundManager.java similarity index 97% rename from client/src/com/aapeli/client/SoundManager.java rename to client/src/main/java/com/aapeli/client/SoundManager.java index 0c4aee11..e4925bee 100644 --- a/client/src/com/aapeli/client/SoundManager.java +++ b/client/src/main/java/com/aapeli/client/SoundManager.java @@ -38,7 +38,7 @@ public SoundManager(Applet var1, boolean var2, boolean var3) { this.anURL1486 = var1.getCodeBase(); try { - this.anURL1486 = new URL(this.anURL1486, "sound/"); + this.anURL1486 = new URL(this.anURL1486, "src/main/resources/sound/"); } catch (MalformedURLException var5) { ; } @@ -214,7 +214,7 @@ private void method1688() { try { if (FileUtil.isFileUrl(var1)) { - var1 = new URL(var1, FileUtil.RESOURCE_DIR + "sound/"); + var1 = new URL(var1, FileUtil.RESOURCE_DIR + "src/main/resources/sound/"); } else { var1 = new URL(var1, "../Shared/sound/"); } diff --git a/client/src/com/aapeli/client/SoundPlayer.java b/client/src/main/java/com/aapeli/client/SoundPlayer.java similarity index 100% rename from client/src/com/aapeli/client/SoundPlayer.java rename to client/src/main/java/com/aapeli/client/SoundPlayer.java diff --git a/client/src/com/aapeli/client/StringDraw.java b/client/src/main/java/com/aapeli/client/StringDraw.java similarity index 100% rename from client/src/com/aapeli/client/StringDraw.java rename to client/src/main/java/com/aapeli/client/StringDraw.java diff --git a/client/src/com/aapeli/client/TextManager.java b/client/src/main/java/com/aapeli/client/TextManager.java similarity index 100% rename from client/src/com/aapeli/client/TextManager.java rename to client/src/main/java/com/aapeli/client/TextManager.java diff --git a/client/src/com/aapeli/client/Tournament.java b/client/src/main/java/com/aapeli/client/Tournament.java similarity index 100% rename from client/src/com/aapeli/client/Tournament.java rename to client/src/main/java/com/aapeli/client/Tournament.java diff --git a/client/src/com/aapeli/client/UrlLabel.java b/client/src/main/java/com/aapeli/client/UrlLabel.java similarity index 100% rename from client/src/com/aapeli/client/UrlLabel.java rename to client/src/main/java/com/aapeli/client/UrlLabel.java diff --git a/client/src/com/aapeli/client/UrlLabelRegister.java b/client/src/main/java/com/aapeli/client/UrlLabelRegister.java similarity index 100% rename from client/src/com/aapeli/client/UrlLabelRegister.java rename to client/src/main/java/com/aapeli/client/UrlLabelRegister.java diff --git a/client/src/com/aapeli/colorgui/Choicer.java b/client/src/main/java/com/aapeli/colorgui/Choicer.java similarity index 100% rename from client/src/com/aapeli/colorgui/Choicer.java rename to client/src/main/java/com/aapeli/colorgui/Choicer.java diff --git a/client/src/com/aapeli/colorgui/Class90.java b/client/src/main/java/com/aapeli/colorgui/Class90.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class90.java rename to client/src/main/java/com/aapeli/colorgui/Class90.java diff --git a/client/src/com/aapeli/colorgui/Class91.java b/client/src/main/java/com/aapeli/colorgui/Class91.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class91.java rename to client/src/main/java/com/aapeli/colorgui/Class91.java diff --git a/client/src/com/aapeli/colorgui/Class92.java b/client/src/main/java/com/aapeli/colorgui/Class92.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class92.java rename to client/src/main/java/com/aapeli/colorgui/Class92.java diff --git a/client/src/com/aapeli/colorgui/Class93.java b/client/src/main/java/com/aapeli/colorgui/Class93.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class93.java rename to client/src/main/java/com/aapeli/colorgui/Class93.java diff --git a/client/src/com/aapeli/colorgui/Class94.java b/client/src/main/java/com/aapeli/colorgui/Class94.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class94.java rename to client/src/main/java/com/aapeli/colorgui/Class94.java diff --git a/client/src/com/aapeli/colorgui/Class95.java b/client/src/main/java/com/aapeli/colorgui/Class95.java similarity index 100% rename from client/src/com/aapeli/colorgui/Class95.java rename to client/src/main/java/com/aapeli/colorgui/Class95.java diff --git a/client/src/com/aapeli/colorgui/ColorButton.java b/client/src/main/java/com/aapeli/colorgui/ColorButton.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorButton.java rename to client/src/main/java/com/aapeli/colorgui/ColorButton.java diff --git a/client/src/com/aapeli/colorgui/ColorCheckbox.java b/client/src/main/java/com/aapeli/colorgui/ColorCheckbox.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorCheckbox.java rename to client/src/main/java/com/aapeli/colorgui/ColorCheckbox.java diff --git a/client/src/com/aapeli/colorgui/ColorCheckboxGroup.java b/client/src/main/java/com/aapeli/colorgui/ColorCheckboxGroup.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorCheckboxGroup.java rename to client/src/main/java/com/aapeli/colorgui/ColorCheckboxGroup.java diff --git a/client/src/com/aapeli/colorgui/ColorList.java b/client/src/main/java/com/aapeli/colorgui/ColorList.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorList.java rename to client/src/main/java/com/aapeli/colorgui/ColorList.java diff --git a/client/src/com/aapeli/colorgui/ColorListItem.java b/client/src/main/java/com/aapeli/colorgui/ColorListItem.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorListItem.java rename to client/src/main/java/com/aapeli/colorgui/ColorListItem.java diff --git a/client/src/com/aapeli/colorgui/ColorListItemGroup.java b/client/src/main/java/com/aapeli/colorgui/ColorListItemGroup.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorListItemGroup.java rename to client/src/main/java/com/aapeli/colorgui/ColorListItemGroup.java diff --git a/client/src/com/aapeli/colorgui/ColorSpinner.java b/client/src/main/java/com/aapeli/colorgui/ColorSpinner.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorSpinner.java rename to client/src/main/java/com/aapeli/colorgui/ColorSpinner.java diff --git a/client/src/com/aapeli/colorgui/ColorTextArea.java b/client/src/main/java/com/aapeli/colorgui/ColorTextArea.java similarity index 100% rename from client/src/com/aapeli/colorgui/ColorTextArea.java rename to client/src/main/java/com/aapeli/colorgui/ColorTextArea.java diff --git a/client/src/com/aapeli/colorgui/KeyboardButton.java b/client/src/main/java/com/aapeli/colorgui/KeyboardButton.java similarity index 100% rename from client/src/com/aapeli/colorgui/KeyboardButton.java rename to client/src/main/java/com/aapeli/colorgui/KeyboardButton.java diff --git a/client/src/com/aapeli/colorgui/MultiColorList.java b/client/src/main/java/com/aapeli/colorgui/MultiColorList.java similarity index 100% rename from client/src/com/aapeli/colorgui/MultiColorList.java rename to client/src/main/java/com/aapeli/colorgui/MultiColorList.java diff --git a/client/src/com/aapeli/colorgui/MultiColorListItem.java b/client/src/main/java/com/aapeli/colorgui/MultiColorListItem.java similarity index 100% rename from client/src/com/aapeli/colorgui/MultiColorListItem.java rename to client/src/main/java/com/aapeli/colorgui/MultiColorListItem.java diff --git a/client/src/com/aapeli/colorgui/MultiColorListListener.java b/client/src/main/java/com/aapeli/colorgui/MultiColorListListener.java similarity index 100% rename from client/src/com/aapeli/colorgui/MultiColorListListener.java rename to client/src/main/java/com/aapeli/colorgui/MultiColorListListener.java diff --git a/client/src/com/aapeli/colorgui/ProgressBar.java b/client/src/main/java/com/aapeli/colorgui/ProgressBar.java similarity index 100% rename from client/src/com/aapeli/colorgui/ProgressBar.java rename to client/src/main/java/com/aapeli/colorgui/ProgressBar.java diff --git a/client/src/com/aapeli/colorgui/RadioButton.java b/client/src/main/java/com/aapeli/colorgui/RadioButton.java similarity index 100% rename from client/src/com/aapeli/colorgui/RadioButton.java rename to client/src/main/java/com/aapeli/colorgui/RadioButton.java diff --git a/client/src/com/aapeli/colorgui/RadioButtonGroup.java b/client/src/main/java/com/aapeli/colorgui/RadioButtonGroup.java similarity index 100% rename from client/src/com/aapeli/colorgui/RadioButtonGroup.java rename to client/src/main/java/com/aapeli/colorgui/RadioButtonGroup.java diff --git a/client/src/com/aapeli/colorgui/RoundButton.java b/client/src/main/java/com/aapeli/colorgui/RoundButton.java similarity index 100% rename from client/src/com/aapeli/colorgui/RoundButton.java rename to client/src/main/java/com/aapeli/colorgui/RoundButton.java diff --git a/client/src/com/aapeli/colorgui/RoundRadioButton.java b/client/src/main/java/com/aapeli/colorgui/RoundRadioButton.java similarity index 100% rename from client/src/com/aapeli/colorgui/RoundRadioButton.java rename to client/src/main/java/com/aapeli/colorgui/RoundRadioButton.java diff --git a/client/src/com/aapeli/colorgui/TabBar.java b/client/src/main/java/com/aapeli/colorgui/TabBar.java similarity index 100% rename from client/src/com/aapeli/colorgui/TabBar.java rename to client/src/main/java/com/aapeli/colorgui/TabBar.java diff --git a/client/src/com/aapeli/colorgui/TabBarItem.java b/client/src/main/java/com/aapeli/colorgui/TabBarItem.java similarity index 100% rename from client/src/com/aapeli/colorgui/TabBarItem.java rename to client/src/main/java/com/aapeli/colorgui/TabBarItem.java diff --git a/client/src/com/aapeli/colorgui/TabBarListener.java b/client/src/main/java/com/aapeli/colorgui/TabBarListener.java similarity index 100% rename from client/src/com/aapeli/colorgui/TabBarListener.java rename to client/src/main/java/com/aapeli/colorgui/TabBarListener.java diff --git a/client/src/com/aapeli/connection/ConnCipher.java b/client/src/main/java/com/aapeli/connection/ConnCipher.java similarity index 100% rename from client/src/com/aapeli/connection/ConnCipher.java rename to client/src/main/java/com/aapeli/connection/ConnCipher.java diff --git a/client/src/com/aapeli/connection/ConnListener.java b/client/src/main/java/com/aapeli/connection/ConnListener.java similarity index 100% rename from client/src/com/aapeli/connection/ConnListener.java rename to client/src/main/java/com/aapeli/connection/ConnListener.java diff --git a/client/src/com/aapeli/connection/ConnRandom.java b/client/src/main/java/com/aapeli/connection/ConnRandom.java similarity index 100% rename from client/src/com/aapeli/connection/ConnRandom.java rename to client/src/main/java/com/aapeli/connection/ConnRandom.java diff --git a/client/src/com/aapeli/connection/Connection.java b/client/src/main/java/com/aapeli/connection/Connection.java similarity index 100% rename from client/src/com/aapeli/connection/Connection.java rename to client/src/main/java/com/aapeli/connection/Connection.java diff --git a/client/src/com/aapeli/connection/GameCipher.java b/client/src/main/java/com/aapeli/connection/GameCipher.java similarity index 100% rename from client/src/com/aapeli/connection/GameCipher.java rename to client/src/main/java/com/aapeli/connection/GameCipher.java diff --git a/client/src/com/aapeli/connection/GamePacketQueue.java b/client/src/main/java/com/aapeli/connection/GamePacketQueue.java similarity index 100% rename from client/src/com/aapeli/connection/GamePacketQueue.java rename to client/src/main/java/com/aapeli/connection/GamePacketQueue.java diff --git a/client/src/com/aapeli/connection/GameQueue.java b/client/src/main/java/com/aapeli/connection/GameQueue.java similarity index 100% rename from client/src/com/aapeli/connection/GameQueue.java rename to client/src/main/java/com/aapeli/connection/GameQueue.java diff --git a/client/src/com/aapeli/credit/BuyCreditsHandler.java b/client/src/main/java/com/aapeli/credit/BuyCreditsHandler.java similarity index 100% rename from client/src/com/aapeli/credit/BuyCreditsHandler.java rename to client/src/main/java/com/aapeli/credit/BuyCreditsHandler.java diff --git a/client/src/com/aapeli/credit/Canvas_Sub9.java b/client/src/main/java/com/aapeli/credit/Canvas_Sub9.java similarity index 100% rename from client/src/com/aapeli/credit/Canvas_Sub9.java rename to client/src/main/java/com/aapeli/credit/Canvas_Sub9.java diff --git a/client/src/com/aapeli/credit/Class101.java b/client/src/main/java/com/aapeli/credit/Class101.java similarity index 100% rename from client/src/com/aapeli/credit/Class101.java rename to client/src/main/java/com/aapeli/credit/Class101.java diff --git a/client/src/com/aapeli/credit/Class102.java b/client/src/main/java/com/aapeli/credit/Class102.java similarity index 100% rename from client/src/com/aapeli/credit/Class102.java rename to client/src/main/java/com/aapeli/credit/Class102.java diff --git a/client/src/com/aapeli/credit/Class103.java b/client/src/main/java/com/aapeli/credit/Class103.java similarity index 100% rename from client/src/com/aapeli/credit/Class103.java rename to client/src/main/java/com/aapeli/credit/Class103.java diff --git a/client/src/com/aapeli/credit/IPanel_Sub42.java b/client/src/main/java/com/aapeli/credit/IPanel_Sub42.java similarity index 100% rename from client/src/com/aapeli/credit/IPanel_Sub42.java rename to client/src/main/java/com/aapeli/credit/IPanel_Sub42.java diff --git a/client/src/com/aapeli/credit/Product.java b/client/src/main/java/com/aapeli/credit/Product.java similarity index 100% rename from client/src/com/aapeli/credit/Product.java rename to client/src/main/java/com/aapeli/credit/Product.java diff --git a/client/src/com/aapeli/credit/ProductHandler.java b/client/src/main/java/com/aapeli/credit/ProductHandler.java similarity index 100% rename from client/src/com/aapeli/credit/ProductHandler.java rename to client/src/main/java/com/aapeli/credit/ProductHandler.java diff --git a/client/src/com/aapeli/credit/PurchaseFrame.java b/client/src/main/java/com/aapeli/credit/PurchaseFrame.java similarity index 100% rename from client/src/com/aapeli/credit/PurchaseFrame.java rename to client/src/main/java/com/aapeli/credit/PurchaseFrame.java diff --git a/client/src/com/aapeli/credit/PurchaseHandler.java b/client/src/main/java/com/aapeli/credit/PurchaseHandler.java similarity index 100% rename from client/src/com/aapeli/credit/PurchaseHandler.java rename to client/src/main/java/com/aapeli/credit/PurchaseHandler.java diff --git a/client/src/com/aapeli/multiuser/ChallengeFloodProtection.java b/client/src/main/java/com/aapeli/multiuser/ChallengeFloodProtection.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChallengeFloodProtection.java rename to client/src/main/java/com/aapeli/multiuser/ChallengeFloodProtection.java diff --git a/client/src/com/aapeli/multiuser/ChatBase.java b/client/src/main/java/com/aapeli/multiuser/ChatBase.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatBase.java rename to client/src/main/java/com/aapeli/multiuser/ChatBase.java diff --git a/client/src/com/aapeli/multiuser/ChatGame.java b/client/src/main/java/com/aapeli/multiuser/ChatGame.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatGame.java rename to client/src/main/java/com/aapeli/multiuser/ChatGame.java diff --git a/client/src/com/aapeli/multiuser/ChatGameListener.java b/client/src/main/java/com/aapeli/multiuser/ChatGameListener.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatGameListener.java rename to client/src/main/java/com/aapeli/multiuser/ChatGameListener.java diff --git a/client/src/com/aapeli/multiuser/ChatListener.java b/client/src/main/java/com/aapeli/multiuser/ChatListener.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatListener.java rename to client/src/main/java/com/aapeli/multiuser/ChatListener.java diff --git a/client/src/com/aapeli/multiuser/ChatLobby.java b/client/src/main/java/com/aapeli/multiuser/ChatLobby.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatLobby.java rename to client/src/main/java/com/aapeli/multiuser/ChatLobby.java diff --git a/client/src/com/aapeli/multiuser/ChatSimple.java b/client/src/main/java/com/aapeli/multiuser/ChatSimple.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatSimple.java rename to client/src/main/java/com/aapeli/multiuser/ChatSimple.java diff --git a/client/src/com/aapeli/multiuser/ChatTextArea.java b/client/src/main/java/com/aapeli/multiuser/ChatTextArea.java similarity index 100% rename from client/src/com/aapeli/multiuser/ChatTextArea.java rename to client/src/main/java/com/aapeli/multiuser/ChatTextArea.java diff --git a/client/src/com/aapeli/multiuser/ColorButton_Sub1.java b/client/src/main/java/com/aapeli/multiuser/ColorButton_Sub1.java similarity index 100% rename from client/src/com/aapeli/multiuser/ColorButton_Sub1.java rename to client/src/main/java/com/aapeli/multiuser/ColorButton_Sub1.java diff --git a/client/src/com/aapeli/multiuser/CopyChatFrame.java b/client/src/main/java/com/aapeli/multiuser/CopyChatFrame.java similarity index 100% rename from client/src/com/aapeli/multiuser/CopyChatFrame.java rename to client/src/main/java/com/aapeli/multiuser/CopyChatFrame.java diff --git a/client/src/com/aapeli/multiuser/FloodProtection.java b/client/src/main/java/com/aapeli/multiuser/FloodProtection.java similarity index 100% rename from client/src/com/aapeli/multiuser/FloodProtection.java rename to client/src/main/java/com/aapeli/multiuser/FloodProtection.java diff --git a/client/src/com/aapeli/multiuser/GlobalChatListener.java b/client/src/main/java/com/aapeli/multiuser/GlobalChatListener.java similarity index 100% rename from client/src/com/aapeli/multiuser/GlobalChatListener.java rename to client/src/main/java/com/aapeli/multiuser/GlobalChatListener.java diff --git a/client/src/com/aapeli/multiuser/GlobalTextArea.java b/client/src/main/java/com/aapeli/multiuser/GlobalTextArea.java similarity index 100% rename from client/src/com/aapeli/multiuser/GlobalTextArea.java rename to client/src/main/java/com/aapeli/multiuser/GlobalTextArea.java diff --git a/client/src/com/aapeli/multiuser/Languages.java b/client/src/main/java/com/aapeli/multiuser/Languages.java similarity index 100% rename from client/src/com/aapeli/multiuser/Languages.java rename to client/src/main/java/com/aapeli/multiuser/Languages.java diff --git a/client/src/com/aapeli/multiuser/NoChallCheckbox.java b/client/src/main/java/com/aapeli/multiuser/NoChallCheckbox.java similarity index 100% rename from client/src/com/aapeli/multiuser/NoChallCheckbox.java rename to client/src/main/java/com/aapeli/multiuser/NoChallCheckbox.java diff --git a/client/src/com/aapeli/multiuser/QuitConfirm.java b/client/src/main/java/com/aapeli/multiuser/QuitConfirm.java similarity index 100% rename from client/src/com/aapeli/multiuser/QuitConfirm.java rename to client/src/main/java/com/aapeli/multiuser/QuitConfirm.java diff --git a/client/src/com/aapeli/multiuser/QuitHandler.java b/client/src/main/java/com/aapeli/multiuser/QuitHandler.java similarity index 100% rename from client/src/com/aapeli/multiuser/QuitHandler.java rename to client/src/main/java/com/aapeli/multiuser/QuitHandler.java diff --git a/client/src/com/aapeli/multiuser/StaffActionFrame.java b/client/src/main/java/com/aapeli/multiuser/StaffActionFrame.java similarity index 100% rename from client/src/com/aapeli/multiuser/StaffActionFrame.java rename to client/src/main/java/com/aapeli/multiuser/StaffActionFrame.java diff --git a/client/src/com/aapeli/multiuser/UserList.java b/client/src/main/java/com/aapeli/multiuser/UserList.java similarity index 100% rename from client/src/com/aapeli/multiuser/UserList.java rename to client/src/main/java/com/aapeli/multiuser/UserList.java diff --git a/client/src/com/aapeli/multiuser/UserListHandler.java b/client/src/main/java/com/aapeli/multiuser/UserListHandler.java similarity index 100% rename from client/src/com/aapeli/multiuser/UserListHandler.java rename to client/src/main/java/com/aapeli/multiuser/UserListHandler.java diff --git a/client/src/com/aapeli/multiuser/UserListItem.java b/client/src/main/java/com/aapeli/multiuser/UserListItem.java similarity index 100% rename from client/src/com/aapeli/multiuser/UserListItem.java rename to client/src/main/java/com/aapeli/multiuser/UserListItem.java diff --git a/client/src/com/aapeli/order/OrderCanvas.java b/client/src/main/java/com/aapeli/order/OrderCanvas.java similarity index 100% rename from client/src/com/aapeli/order/OrderCanvas.java rename to client/src/main/java/com/aapeli/order/OrderCanvas.java diff --git a/client/src/com/aapeli/order/OrderFrame.java b/client/src/main/java/com/aapeli/order/OrderFrame.java similarity index 100% rename from client/src/com/aapeli/order/OrderFrame.java rename to client/src/main/java/com/aapeli/order/OrderFrame.java diff --git a/client/src/com/aapeli/order/OrderHandler.java b/client/src/main/java/com/aapeli/order/OrderHandler.java similarity index 100% rename from client/src/com/aapeli/order/OrderHandler.java rename to client/src/main/java/com/aapeli/order/OrderHandler.java diff --git a/client/src/com/aapeli/settingsgui/GuiListener.java b/client/src/main/java/com/aapeli/settingsgui/GuiListener.java similarity index 100% rename from client/src/com/aapeli/settingsgui/GuiListener.java rename to client/src/main/java/com/aapeli/settingsgui/GuiListener.java diff --git a/client/src/com/aapeli/settingsgui/GuiListenerExt.java b/client/src/main/java/com/aapeli/settingsgui/GuiListenerExt.java similarity index 100% rename from client/src/com/aapeli/settingsgui/GuiListenerExt.java rename to client/src/main/java/com/aapeli/settingsgui/GuiListenerExt.java diff --git a/client/src/com/aapeli/settingsgui/LobbyRoomSettingsPanel.java b/client/src/main/java/com/aapeli/settingsgui/LobbyRoomSettingsPanel.java similarity index 100% rename from client/src/com/aapeli/settingsgui/LobbyRoomSettingsPanel.java rename to client/src/main/java/com/aapeli/settingsgui/LobbyRoomSettingsPanel.java diff --git a/client/src/com/aapeli/settingsgui/Rule.java b/client/src/main/java/com/aapeli/settingsgui/Rule.java similarity index 100% rename from client/src/com/aapeli/settingsgui/Rule.java rename to client/src/main/java/com/aapeli/settingsgui/Rule.java diff --git a/client/src/com/aapeli/settingsgui/Unit.java b/client/src/main/java/com/aapeli/settingsgui/Unit.java similarity index 100% rename from client/src/com/aapeli/settingsgui/Unit.java rename to client/src/main/java/com/aapeli/settingsgui/Unit.java diff --git a/client/src/com/aapeli/settingsgui/UnitButton.java b/client/src/main/java/com/aapeli/settingsgui/UnitButton.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitButton.java rename to client/src/main/java/com/aapeli/settingsgui/UnitButton.java diff --git a/client/src/com/aapeli/settingsgui/UnitCheckbox.java b/client/src/main/java/com/aapeli/settingsgui/UnitCheckbox.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitCheckbox.java rename to client/src/main/java/com/aapeli/settingsgui/UnitCheckbox.java diff --git a/client/src/com/aapeli/settingsgui/UnitCheckboxGroup.java b/client/src/main/java/com/aapeli/settingsgui/UnitCheckboxGroup.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitCheckboxGroup.java rename to client/src/main/java/com/aapeli/settingsgui/UnitCheckboxGroup.java diff --git a/client/src/com/aapeli/settingsgui/UnitChoice.java b/client/src/main/java/com/aapeli/settingsgui/UnitChoice.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitChoice.java rename to client/src/main/java/com/aapeli/settingsgui/UnitChoice.java diff --git a/client/src/com/aapeli/settingsgui/UnitData.java b/client/src/main/java/com/aapeli/settingsgui/UnitData.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitData.java rename to client/src/main/java/com/aapeli/settingsgui/UnitData.java diff --git a/client/src/com/aapeli/settingsgui/UnitLabel.java b/client/src/main/java/com/aapeli/settingsgui/UnitLabel.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitLabel.java rename to client/src/main/java/com/aapeli/settingsgui/UnitLabel.java diff --git a/client/src/com/aapeli/settingsgui/UnitSpace.java b/client/src/main/java/com/aapeli/settingsgui/UnitSpace.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitSpace.java rename to client/src/main/java/com/aapeli/settingsgui/UnitSpace.java diff --git a/client/src/com/aapeli/settingsgui/UnitTextField.java b/client/src/main/java/com/aapeli/settingsgui/UnitTextField.java similarity index 100% rename from client/src/com/aapeli/settingsgui/UnitTextField.java rename to client/src/main/java/com/aapeli/settingsgui/UnitTextField.java diff --git a/client/src/com/aapeli/singleclient/Class105.java b/client/src/main/java/com/aapeli/singleclient/Class105.java similarity index 100% rename from client/src/com/aapeli/singleclient/Class105.java rename to client/src/main/java/com/aapeli/singleclient/Class105.java diff --git a/client/src/com/aapeli/singleclient/Class106.java b/client/src/main/java/com/aapeli/singleclient/Class106.java similarity index 100% rename from client/src/com/aapeli/singleclient/Class106.java rename to client/src/main/java/com/aapeli/singleclient/Class106.java diff --git a/client/src/com/aapeli/singleclient/HashTableContainer.java b/client/src/main/java/com/aapeli/singleclient/HashTableContainer.java similarity index 100% rename from client/src/com/aapeli/singleclient/HashTableContainer.java rename to client/src/main/java/com/aapeli/singleclient/HashTableContainer.java diff --git a/client/src/com/aapeli/singleclient/SingleClient.java b/client/src/main/java/com/aapeli/singleclient/SingleClient.java similarity index 100% rename from client/src/com/aapeli/singleclient/SingleClient.java rename to client/src/main/java/com/aapeli/singleclient/SingleClient.java diff --git a/client/src/com/aapeli/singleclient/SingleGame.java b/client/src/main/java/com/aapeli/singleclient/SingleGame.java similarity index 100% rename from client/src/com/aapeli/singleclient/SingleGame.java rename to client/src/main/java/com/aapeli/singleclient/SingleGame.java diff --git a/client/src/com/aapeli/singleclient/TopListUnit.java b/client/src/main/java/com/aapeli/singleclient/TopListUnit.java similarity index 100% rename from client/src/com/aapeli/singleclient/TopListUnit.java rename to client/src/main/java/com/aapeli/singleclient/TopListUnit.java diff --git a/client/src/com/aapeli/tilt/MoneyTextField.java b/client/src/main/java/com/aapeli/tilt/MoneyTextField.java similarity index 100% rename from client/src/com/aapeli/tilt/MoneyTextField.java rename to client/src/main/java/com/aapeli/tilt/MoneyTextField.java diff --git a/client/src/com/aapeli/tools/DelayRepaint.java b/client/src/main/java/com/aapeli/tools/DelayRepaint.java similarity index 100% rename from client/src/com/aapeli/tools/DelayRepaint.java rename to client/src/main/java/com/aapeli/tools/DelayRepaint.java diff --git a/client/src/com/aapeli/tools/DelayTimer.java b/client/src/main/java/com/aapeli/tools/DelayTimer.java similarity index 100% rename from client/src/com/aapeli/tools/DelayTimer.java rename to client/src/main/java/com/aapeli/tools/DelayTimer.java diff --git a/client/src/com/aapeli/tools/EncodedXmlReader.java b/client/src/main/java/com/aapeli/tools/EncodedXmlReader.java similarity index 100% rename from client/src/com/aapeli/tools/EncodedXmlReader.java rename to client/src/main/java/com/aapeli/tools/EncodedXmlReader.java diff --git a/client/src/com/aapeli/tools/QuickTimer.java b/client/src/main/java/com/aapeli/tools/QuickTimer.java similarity index 100% rename from client/src/com/aapeli/tools/QuickTimer.java rename to client/src/main/java/com/aapeli/tools/QuickTimer.java diff --git a/client/src/com/aapeli/tools/QuickTimerListener.java b/client/src/main/java/com/aapeli/tools/QuickTimerListener.java similarity index 100% rename from client/src/com/aapeli/tools/QuickTimerListener.java rename to client/src/main/java/com/aapeli/tools/QuickTimerListener.java diff --git a/client/src/com/aapeli/tools/Sort.java b/client/src/main/java/com/aapeli/tools/Sort.java similarity index 100% rename from client/src/com/aapeli/tools/Sort.java rename to client/src/main/java/com/aapeli/tools/Sort.java diff --git a/client/src/com/aapeli/tools/Sortable.java b/client/src/main/java/com/aapeli/tools/Sortable.java similarity index 100% rename from client/src/com/aapeli/tools/Sortable.java rename to client/src/main/java/com/aapeli/tools/Sortable.java diff --git a/client/src/com/aapeli/tools/Tools.java b/client/src/main/java/com/aapeli/tools/Tools.java similarity index 100% rename from client/src/com/aapeli/tools/Tools.java rename to client/src/main/java/com/aapeli/tools/Tools.java diff --git a/client/src/com/aapeli/tools/XmlUnit.java b/client/src/main/java/com/aapeli/tools/XmlUnit.java similarity index 100% rename from client/src/com/aapeli/tools/XmlUnit.java rename to client/src/main/java/com/aapeli/tools/XmlUnit.java diff --git a/client/src/org/moparforia/client/Launcher.java b/client/src/main/java/org/moparforia/client/Launcher.java similarity index 99% rename from client/src/org/moparforia/client/Launcher.java rename to client/src/main/java/org/moparforia/client/Launcher.java index c832e774..ac1fa563 100644 --- a/client/src/org/moparforia/client/Launcher.java +++ b/client/src/main/java/org/moparforia/client/Launcher.java @@ -1,7 +1,6 @@ package org.moparforia.client; import agolf.AGolf; -import com.aapeli.connection.GameCipher; import javax.swing.*; import java.applet.Applet; @@ -9,7 +8,6 @@ import java.applet.AppletStub; import java.awt.*; import java.net.URL; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; @@ -418,7 +416,7 @@ public Stub(String server,String lang, boolean verbose) { params = new HashMap(); params.put("initmessage", "Loading game..."); params.put("ld_page", "javascript:Playray.Notify.delegate({ jvm: { version: '%v', vendor: '%w', t1: '%r', t2: '%f' } })"); - params.put("image", "/appletloader_playforia.gif"); + params.put("image", "/src/main/resources/appletloader_playforia.gif"); /*if(serverBox.isSelected()) { params.put("server", "149.255.111.161" + ":" + g.port); } else { diff --git a/client/src/org/moparforia/client/MD5Checksum.java b/client/src/main/java/org/moparforia/client/MD5Checksum.java similarity index 100% rename from client/src/org/moparforia/client/MD5Checksum.java rename to client/src/main/java/org/moparforia/client/MD5Checksum.java diff --git a/client/src/org/moparforia/client/TrackDumper.java b/client/src/main/java/org/moparforia/client/TrackDumper.java similarity index 100% rename from client/src/org/moparforia/client/TrackDumper.java rename to client/src/main/java/org/moparforia/client/TrackDumper.java diff --git a/client/src/org/moparforia/client/recordz.java b/client/src/main/java/org/moparforia/client/recordz.java similarity index 100% rename from client/src/org/moparforia/client/recordz.java rename to client/src/main/java/org/moparforia/client/recordz.java diff --git a/client/src/org/moparforia/client/trackdump/Class100.java b/client/src/main/java/org/moparforia/client/trackdump/Class100.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/Class100.java rename to client/src/main/java/org/moparforia/client/trackdump/Class100.java diff --git a/client/src/org/moparforia/client/trackdump/Class98.java b/client/src/main/java/org/moparforia/client/trackdump/Class98.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/Class98.java rename to client/src/main/java/org/moparforia/client/trackdump/Class98.java diff --git a/client/src/org/moparforia/client/trackdump/ConnCrypto.java b/client/src/main/java/org/moparforia/client/trackdump/ConnCrypto.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/ConnCrypto.java rename to client/src/main/java/org/moparforia/client/trackdump/ConnCrypto.java diff --git a/client/src/org/moparforia/client/trackdump/ConnListener.java b/client/src/main/java/org/moparforia/client/trackdump/ConnListener.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/ConnListener.java rename to client/src/main/java/org/moparforia/client/trackdump/ConnListener.java diff --git a/client/src/org/moparforia/client/trackdump/Connection.java b/client/src/main/java/org/moparforia/client/trackdump/Connection.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/Connection.java rename to client/src/main/java/org/moparforia/client/trackdump/Connection.java diff --git a/client/src/org/moparforia/client/trackdump/GameCrypto.java b/client/src/main/java/org/moparforia/client/trackdump/GameCrypto.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/GameCrypto.java rename to client/src/main/java/org/moparforia/client/trackdump/GameCrypto.java diff --git a/client/src/org/moparforia/client/trackdump/GamePacketQueue.java b/client/src/main/java/org/moparforia/client/trackdump/GamePacketQueue.java similarity index 100% rename from client/src/org/moparforia/client/trackdump/GamePacketQueue.java rename to client/src/main/java/org/moparforia/client/trackdump/GamePacketQueue.java diff --git a/client/res/appletloader_playforia.gif b/client/src/main/resources/appletloader_playforia.gif similarity index 100% rename from client/res/appletloader_playforia.gif rename to client/src/main/resources/appletloader_playforia.gif diff --git a/client/res/icons/playforia.icns b/client/src/main/resources/icons/playforia.icns similarity index 100% rename from client/res/icons/playforia.icns rename to client/src/main/resources/icons/playforia.icns diff --git a/client/res/icons/playforia.ico b/client/src/main/resources/icons/playforia.ico similarity index 100% rename from client/res/icons/playforia.ico rename to client/src/main/resources/icons/playforia.ico diff --git a/client/res/l10n/en_US/AGolf.xml b/client/src/main/resources/l10n/en_US/AGolf.xml similarity index 100% rename from client/res/l10n/en_US/AGolf.xml rename to client/src/main/resources/l10n/en_US/AGolf.xml diff --git a/client/res/l10n/en_US/Shared.xml b/client/src/main/resources/l10n/en_US/Shared.xml similarity index 100% rename from client/res/l10n/en_US/Shared.xml rename to client/src/main/resources/l10n/en_US/Shared.xml diff --git a/client/res/l10n/fi_FI/AGolf.xml b/client/src/main/resources/l10n/fi_FI/AGolf.xml similarity index 100% rename from client/res/l10n/fi_FI/AGolf.xml rename to client/src/main/resources/l10n/fi_FI/AGolf.xml diff --git a/client/res/l10n/fi_FI/Shared.xml b/client/src/main/resources/l10n/fi_FI/Shared.xml similarity index 100% rename from client/res/l10n/fi_FI/Shared.xml rename to client/src/main/resources/l10n/fi_FI/Shared.xml diff --git a/client/res/l10n/sv_SE/AGolf.xml b/client/src/main/resources/l10n/sv_SE/AGolf.xml similarity index 100% rename from client/res/l10n/sv_SE/AGolf.xml rename to client/src/main/resources/l10n/sv_SE/AGolf.xml diff --git a/client/res/l10n/sv_SE/Shared.xml b/client/src/main/resources/l10n/sv_SE/Shared.xml similarity index 100% rename from client/res/l10n/sv_SE/Shared.xml rename to client/src/main/resources/l10n/sv_SE/Shared.xml diff --git a/client/res/AGolf/picture/Thumbs.db b/client/src/main/resources/picture/agolf/Thumbs.db similarity index 100% rename from client/res/AGolf/picture/Thumbs.db rename to client/src/main/resources/picture/agolf/Thumbs.db diff --git a/client/res/AGolf/picture/balls.gif b/client/src/main/resources/picture/agolf/balls.gif similarity index 100% rename from client/res/AGolf/picture/balls.gif rename to client/src/main/resources/picture/agolf/balls.gif diff --git a/client/res/AGolf/picture/bg-lobby-dual.gif b/client/src/main/resources/picture/agolf/bg-lobby-dual.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobby-dual.gif rename to client/src/main/resources/picture/agolf/bg-lobby-dual.gif diff --git a/client/res/AGolf/picture/bg-lobby-multi-fade.jpg b/client/src/main/resources/picture/agolf/bg-lobby-multi-fade.jpg similarity index 100% rename from client/res/AGolf/picture/bg-lobby-multi-fade.jpg rename to client/src/main/resources/picture/agolf/bg-lobby-multi-fade.jpg diff --git a/client/res/AGolf/picture/bg-lobby-multi-new.gif b/client/src/main/resources/picture/agolf/bg-lobby-multi-new.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobby-multi-new.gif rename to client/src/main/resources/picture/agolf/bg-lobby-multi-new.gif diff --git a/client/res/AGolf/picture/bg-lobby-multi.gif b/client/src/main/resources/picture/agolf/bg-lobby-multi.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobby-multi.gif rename to client/src/main/resources/picture/agolf/bg-lobby-multi.gif diff --git a/client/res/AGolf/picture/bg-lobby-password.gif b/client/src/main/resources/picture/agolf/bg-lobby-password.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobby-password.gif rename to client/src/main/resources/picture/agolf/bg-lobby-password.gif diff --git a/client/res/AGolf/picture/bg-lobby-single-fade.jpg b/client/src/main/resources/picture/agolf/bg-lobby-single-fade.jpg similarity index 100% rename from client/res/AGolf/picture/bg-lobby-single-fade.jpg rename to client/src/main/resources/picture/agolf/bg-lobby-single-fade.jpg diff --git a/client/res/AGolf/picture/bg-lobby-single.gif b/client/src/main/resources/picture/agolf/bg-lobby-single.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobby-single.gif rename to client/src/main/resources/picture/agolf/bg-lobby-single.gif diff --git a/client/res/AGolf/picture/bg-lobbyselect.gif b/client/src/main/resources/picture/agolf/bg-lobbyselect.gif similarity index 100% rename from client/res/AGolf/picture/bg-lobbyselect.gif rename to client/src/main/resources/picture/agolf/bg-lobbyselect.gif diff --git a/client/res/AGolf/picture/elements.gif b/client/src/main/resources/picture/agolf/elements.gif similarity index 100% rename from client/res/AGolf/picture/elements.gif rename to client/src/main/resources/picture/agolf/elements.gif diff --git a/client/res/AGolf/picture/shapes.gif b/client/src/main/resources/picture/agolf/shapes.gif similarity index 100% rename from client/res/AGolf/picture/shapes.gif rename to client/src/main/resources/picture/agolf/shapes.gif diff --git a/client/res/AGolf/picture/special.gif b/client/src/main/resources/picture/agolf/special.gif similarity index 100% rename from client/res/AGolf/picture/special.gif rename to client/src/main/resources/picture/agolf/special.gif diff --git a/client/res/Shared/picture/bigtext.gif b/client/src/main/resources/picture/shared/bigtext.gif similarity index 100% rename from client/res/Shared/picture/bigtext.gif rename to client/src/main/resources/picture/shared/bigtext.gif diff --git a/client/res/Shared/picture/credit-background.jpg b/client/src/main/resources/picture/shared/credit-background.jpg similarity index 100% rename from client/res/Shared/picture/credit-background.jpg rename to client/src/main/resources/picture/shared/credit-background.jpg diff --git a/client/res/Shared/picture/icon.png b/client/src/main/resources/picture/shared/icon.png similarity index 100% rename from client/res/Shared/picture/icon.png rename to client/src/main/resources/picture/shared/icon.png diff --git a/client/res/Shared/picture/language-flags.png b/client/src/main/resources/picture/shared/language-flags.png similarity index 100% rename from client/res/Shared/picture/language-flags.png rename to client/src/main/resources/picture/shared/language-flags.png diff --git a/client/res/Shared/picture/ranking-icons.gif b/client/src/main/resources/picture/shared/ranking-icons.gif similarity index 100% rename from client/res/Shared/picture/ranking-icons.gif rename to client/src/main/resources/picture/shared/ranking-icons.gif diff --git a/client/res/Shared/picture/tf-background.gif b/client/src/main/resources/picture/shared/tf-background.gif similarity index 100% rename from client/res/Shared/picture/tf-background.gif rename to client/src/main/resources/picture/shared/tf-background.gif diff --git a/client/res/Shared/sound/challenge.au b/client/src/main/resources/sound/shared/challenge.au similarity index 100% rename from client/res/Shared/sound/challenge.au rename to client/src/main/resources/sound/shared/challenge.au diff --git a/client/res/Shared/sound/game-draw.au b/client/src/main/resources/sound/shared/game-draw.au similarity index 100% rename from client/res/Shared/sound/game-draw.au rename to client/src/main/resources/sound/shared/game-draw.au diff --git a/client/res/Shared/sound/game-loser.au b/client/src/main/resources/sound/shared/game-loser.au similarity index 100% rename from client/res/Shared/sound/game-loser.au rename to client/src/main/resources/sound/shared/game-loser.au diff --git a/client/res/Shared/sound/game-winner.au b/client/src/main/resources/sound/shared/game-winner.au similarity index 100% rename from client/res/Shared/sound/game-winner.au rename to client/src/main/resources/sound/shared/game-winner.au diff --git a/client/res/Shared/sound/gamemove.au b/client/src/main/resources/sound/shared/gamemove.au similarity index 100% rename from client/res/Shared/sound/gamemove.au rename to client/src/main/resources/sound/shared/gamemove.au diff --git a/client/res/Shared/sound/illegal.au b/client/src/main/resources/sound/shared/illegal.au similarity index 100% rename from client/res/Shared/sound/illegal.au rename to client/src/main/resources/sound/shared/illegal.au diff --git a/client/res/Shared/sound/notify.au b/client/src/main/resources/sound/shared/notify.au similarity index 100% rename from client/res/Shared/sound/notify.au rename to client/src/main/resources/sound/shared/notify.au diff --git a/client/res/Shared/sound/timelow.au b/client/src/main/resources/sound/shared/timelow.au similarity index 100% rename from client/res/Shared/sound/timelow.au rename to client/src/main/resources/sound/shared/timelow.au diff --git a/editor/src/META-INF/MANIFEST.MF b/editor/src/META-INF/MANIFEST.MF deleted file mode 100644 index 5c7df59f..00000000 --- a/editor/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: org.moparforia.editor.TrackEditor - diff --git a/editor/src/org/moparforia/editor/EditorPanel.java b/editor/src/main/java/org/moparforia/editor/EditorPanel.java similarity index 100% rename from editor/src/org/moparforia/editor/EditorPanel.java rename to editor/src/main/java/org/moparforia/editor/EditorPanel.java diff --git a/editor/src/org/moparforia/editor/IEditor.java b/editor/src/main/java/org/moparforia/editor/IEditor.java similarity index 100% rename from editor/src/org/moparforia/editor/IEditor.java rename to editor/src/main/java/org/moparforia/editor/IEditor.java diff --git a/editor/src/org/moparforia/editor/Map.java b/editor/src/main/java/org/moparforia/editor/Map.java similarity index 100% rename from editor/src/org/moparforia/editor/Map.java rename to editor/src/main/java/org/moparforia/editor/Map.java diff --git a/editor/src/org/moparforia/editor/MapCanvas.java b/editor/src/main/java/org/moparforia/editor/MapCanvas.java similarity index 100% rename from editor/src/org/moparforia/editor/MapCanvas.java rename to editor/src/main/java/org/moparforia/editor/MapCanvas.java diff --git a/editor/src/org/moparforia/editor/MapCompressor.java b/editor/src/main/java/org/moparforia/editor/MapCompressor.java similarity index 100% rename from editor/src/org/moparforia/editor/MapCompressor.java rename to editor/src/main/java/org/moparforia/editor/MapCompressor.java diff --git a/editor/src/org/moparforia/editor/MapDecompressor.java b/editor/src/main/java/org/moparforia/editor/MapDecompressor.java similarity index 100% rename from editor/src/org/moparforia/editor/MapDecompressor.java rename to editor/src/main/java/org/moparforia/editor/MapDecompressor.java diff --git a/editor/src/org/moparforia/editor/SpriteManager.java b/editor/src/main/java/org/moparforia/editor/SpriteManager.java similarity index 100% rename from editor/src/org/moparforia/editor/SpriteManager.java rename to editor/src/main/java/org/moparforia/editor/SpriteManager.java diff --git a/editor/src/org/moparforia/editor/Tile.java b/editor/src/main/java/org/moparforia/editor/Tile.java similarity index 100% rename from editor/src/org/moparforia/editor/Tile.java rename to editor/src/main/java/org/moparforia/editor/Tile.java diff --git a/editor/src/org/moparforia/editor/TrackEditor.java b/editor/src/main/java/org/moparforia/editor/TrackEditor.java similarity index 100% rename from editor/src/org/moparforia/editor/TrackEditor.java rename to editor/src/main/java/org/moparforia/editor/TrackEditor.java diff --git a/editor/src/org/moparforia/editor/TrackEditor.jfd b/editor/src/main/java/org/moparforia/editor/TrackEditor.jfd similarity index 100% rename from editor/src/org/moparforia/editor/TrackEditor.jfd rename to editor/src/main/java/org/moparforia/editor/TrackEditor.jfd diff --git a/editor/src/org/moparforia/editor/TrackPropertiesDialog.java b/editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.java similarity index 100% rename from editor/src/org/moparforia/editor/TrackPropertiesDialog.java rename to editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.java diff --git a/editor/src/org/moparforia/editor/TrackPropertiesDialog.jfd b/editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.jfd similarity index 100% rename from editor/src/org/moparforia/editor/TrackPropertiesDialog.jfd rename to editor/src/main/java/org/moparforia/editor/TrackPropertiesDialog.jfd diff --git a/editor/src/org/moparforia/editor/util/RectangleDragSelector.java b/editor/src/main/java/org/moparforia/editor/util/RectangleDragSelector.java similarity index 100% rename from editor/src/org/moparforia/editor/util/RectangleDragSelector.java rename to editor/src/main/java/org/moparforia/editor/util/RectangleDragSelector.java diff --git a/editor/res/Thumbs.db b/editor/src/main/resources/Thumbs.db similarity index 100% rename from editor/res/Thumbs.db rename to editor/src/main/resources/Thumbs.db diff --git a/editor/res/balls.gif b/editor/src/main/resources/balls.gif similarity index 100% rename from editor/res/balls.gif rename to editor/src/main/resources/balls.gif diff --git a/editor/res/elements.gif b/editor/src/main/resources/elements.gif similarity index 100% rename from editor/res/elements.gif rename to editor/src/main/resources/elements.gif diff --git a/editor/res/fill_icon&16.png b/editor/src/main/resources/fill_icon&16.png similarity index 100% rename from editor/res/fill_icon&16.png rename to editor/src/main/resources/fill_icon&16.png diff --git a/editor/res/pencil_icon&16.png b/editor/src/main/resources/pencil_icon&16.png similarity index 100% rename from editor/res/pencil_icon&16.png rename to editor/src/main/resources/pencil_icon&16.png diff --git a/editor/res/playback_rec_icon&16.png b/editor/src/main/resources/playback_rec_icon&16.png similarity index 100% rename from editor/res/playback_rec_icon&16.png rename to editor/src/main/resources/playback_rec_icon&16.png diff --git a/editor/res/playback_stop_icon&16.png b/editor/src/main/resources/playback_stop_icon&16.png similarity index 100% rename from editor/res/playback_stop_icon&16.png rename to editor/src/main/resources/playback_stop_icon&16.png diff --git a/editor/res/shapes.gif b/editor/src/main/resources/shapes.gif similarity index 100% rename from editor/res/shapes.gif rename to editor/src/main/resources/shapes.gif diff --git a/editor/res/special.gif b/editor/src/main/resources/special.gif similarity index 100% rename from editor/res/special.gif rename to editor/src/main/resources/special.gif diff --git a/server/src/org/moparforia/server/Server.java b/server/src/main/java/org/moparforia/server/Server.java similarity index 100% rename from server/src/org/moparforia/server/Server.java rename to server/src/main/java/org/moparforia/server/Server.java diff --git a/server/src/org/moparforia/server/db/Database.java b/server/src/main/java/org/moparforia/server/db/Database.java similarity index 100% rename from server/src/org/moparforia/server/db/Database.java rename to server/src/main/java/org/moparforia/server/db/Database.java diff --git a/server/src/org/moparforia/server/event/ClientConnectedEvent.java b/server/src/main/java/org/moparforia/server/event/ClientConnectedEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/ClientConnectedEvent.java rename to server/src/main/java/org/moparforia/server/event/ClientConnectedEvent.java diff --git a/server/src/org/moparforia/server/event/ClientDisconnectedEvent.java b/server/src/main/java/org/moparforia/server/event/ClientDisconnectedEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/ClientDisconnectedEvent.java rename to server/src/main/java/org/moparforia/server/event/ClientDisconnectedEvent.java diff --git a/server/src/org/moparforia/server/event/Event.java b/server/src/main/java/org/moparforia/server/event/Event.java similarity index 100% rename from server/src/org/moparforia/server/event/Event.java rename to server/src/main/java/org/moparforia/server/event/Event.java diff --git a/server/src/org/moparforia/server/event/PacketReceivedEvent.java b/server/src/main/java/org/moparforia/server/event/PacketReceivedEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/PacketReceivedEvent.java rename to server/src/main/java/org/moparforia/server/event/PacketReceivedEvent.java diff --git a/server/src/org/moparforia/server/event/PlayerConnectedEvent.java b/server/src/main/java/org/moparforia/server/event/PlayerConnectedEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/PlayerConnectedEvent.java rename to server/src/main/java/org/moparforia/server/event/PlayerConnectedEvent.java diff --git a/server/src/org/moparforia/server/event/PlayerDisconnectEvent.java b/server/src/main/java/org/moparforia/server/event/PlayerDisconnectEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/PlayerDisconnectEvent.java rename to server/src/main/java/org/moparforia/server/event/PlayerDisconnectEvent.java diff --git a/server/src/org/moparforia/server/event/TimedEvent.java b/server/src/main/java/org/moparforia/server/event/TimedEvent.java similarity index 100% rename from server/src/org/moparforia/server/event/TimedEvent.java rename to server/src/main/java/org/moparforia/server/event/TimedEvent.java diff --git a/server/src/org/moparforia/server/game/Game.java b/server/src/main/java/org/moparforia/server/game/Game.java similarity index 100% rename from server/src/org/moparforia/server/game/Game.java rename to server/src/main/java/org/moparforia/server/game/Game.java diff --git a/server/src/org/moparforia/server/game/GameType.java b/server/src/main/java/org/moparforia/server/game/GameType.java similarity index 100% rename from server/src/org/moparforia/server/game/GameType.java rename to server/src/main/java/org/moparforia/server/game/GameType.java diff --git a/server/src/org/moparforia/server/game/Lobby.java b/server/src/main/java/org/moparforia/server/game/Lobby.java similarity index 100% rename from server/src/org/moparforia/server/game/Lobby.java rename to server/src/main/java/org/moparforia/server/game/Lobby.java diff --git a/server/src/org/moparforia/server/game/LobbyRef.java b/server/src/main/java/org/moparforia/server/game/LobbyRef.java similarity index 100% rename from server/src/org/moparforia/server/game/LobbyRef.java rename to server/src/main/java/org/moparforia/server/game/LobbyRef.java diff --git a/server/src/org/moparforia/server/game/LobbyType.java b/server/src/main/java/org/moparforia/server/game/LobbyType.java similarity index 100% rename from server/src/org/moparforia/server/game/LobbyType.java rename to server/src/main/java/org/moparforia/server/game/LobbyType.java diff --git a/server/src/org/moparforia/server/game/Player.java b/server/src/main/java/org/moparforia/server/game/Player.java similarity index 100% rename from server/src/org/moparforia/server/game/Player.java rename to server/src/main/java/org/moparforia/server/game/Player.java diff --git a/server/src/org/moparforia/server/game/PlayerCollection.java b/server/src/main/java/org/moparforia/server/game/PlayerCollection.java similarity index 100% rename from server/src/org/moparforia/server/game/PlayerCollection.java rename to server/src/main/java/org/moparforia/server/game/PlayerCollection.java diff --git a/server/src/org/moparforia/server/game/gametypes/GolfGame.java b/server/src/main/java/org/moparforia/server/game/gametypes/GolfGame.java similarity index 100% rename from server/src/org/moparforia/server/game/gametypes/GolfGame.java rename to server/src/main/java/org/moparforia/server/game/gametypes/GolfGame.java diff --git a/server/src/org/moparforia/server/game/gametypes/golf/ChampionshipGame.java b/server/src/main/java/org/moparforia/server/game/gametypes/golf/ChampionshipGame.java similarity index 100% rename from server/src/org/moparforia/server/game/gametypes/golf/ChampionshipGame.java rename to server/src/main/java/org/moparforia/server/game/gametypes/golf/ChampionshipGame.java diff --git a/server/src/org/moparforia/server/game/gametypes/golf/DualGame.java b/server/src/main/java/org/moparforia/server/game/gametypes/golf/DualGame.java similarity index 100% rename from server/src/org/moparforia/server/game/gametypes/golf/DualGame.java rename to server/src/main/java/org/moparforia/server/game/gametypes/golf/DualGame.java diff --git a/server/src/org/moparforia/server/game/gametypes/golf/MultiGame.java b/server/src/main/java/org/moparforia/server/game/gametypes/golf/MultiGame.java similarity index 100% rename from server/src/org/moparforia/server/game/gametypes/golf/MultiGame.java rename to server/src/main/java/org/moparforia/server/game/gametypes/golf/MultiGame.java diff --git a/server/src/org/moparforia/server/game/gametypes/golf/TrainingGame.java b/server/src/main/java/org/moparforia/server/game/gametypes/golf/TrainingGame.java similarity index 100% rename from server/src/org/moparforia/server/game/gametypes/golf/TrainingGame.java rename to server/src/main/java/org/moparforia/server/game/gametypes/golf/TrainingGame.java diff --git a/server/src/org/moparforia/server/net/ClientChannelHandler.java b/server/src/main/java/org/moparforia/server/net/ClientChannelHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/ClientChannelHandler.java rename to server/src/main/java/org/moparforia/server/net/ClientChannelHandler.java diff --git a/server/src/org/moparforia/server/net/ClientState.java b/server/src/main/java/org/moparforia/server/net/ClientState.java similarity index 100% rename from server/src/org/moparforia/server/net/ClientState.java rename to server/src/main/java/org/moparforia/server/net/ClientState.java diff --git a/server/src/org/moparforia/server/net/Packet.java b/server/src/main/java/org/moparforia/server/net/Packet.java similarity index 100% rename from server/src/org/moparforia/server/net/Packet.java rename to server/src/main/java/org/moparforia/server/net/Packet.java diff --git a/server/src/org/moparforia/server/net/PacketDecoder.java b/server/src/main/java/org/moparforia/server/net/PacketDecoder.java similarity index 100% rename from server/src/org/moparforia/server/net/PacketDecoder.java rename to server/src/main/java/org/moparforia/server/net/PacketDecoder.java diff --git a/server/src/org/moparforia/server/net/PacketEncoder.java b/server/src/main/java/org/moparforia/server/net/PacketEncoder.java similarity index 100% rename from server/src/org/moparforia/server/net/PacketEncoder.java rename to server/src/main/java/org/moparforia/server/net/PacketEncoder.java diff --git a/server/src/org/moparforia/server/net/PacketHandler.java b/server/src/main/java/org/moparforia/server/net/PacketHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/PacketHandler.java rename to server/src/main/java/org/moparforia/server/net/PacketHandler.java diff --git a/server/src/org/moparforia/server/net/PacketHandlerFactoryGeneratorClassHelperImplementationDecorator.java b/server/src/main/java/org/moparforia/server/net/PacketHandlerFactoryGeneratorClassHelperImplementationDecorator.java similarity index 100% rename from server/src/org/moparforia/server/net/PacketHandlerFactoryGeneratorClassHelperImplementationDecorator.java rename to server/src/main/java/org/moparforia/server/net/PacketHandlerFactoryGeneratorClassHelperImplementationDecorator.java diff --git a/server/src/org/moparforia/server/net/PacketType.java b/server/src/main/java/org/moparforia/server/net/PacketType.java similarity index 100% rename from server/src/org/moparforia/server/net/PacketType.java rename to server/src/main/java/org/moparforia/server/net/PacketType.java diff --git a/server/src/org/moparforia/server/net/packethandlers/NewHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/NewHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/NewHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/NewHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/PongHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/PongHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/PongHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/PongHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/QuitHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/QuitHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/QuitHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/QuitHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/ReconnectHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/ReconnectHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/ReconnectHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/ReconnectHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/TlogHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/TlogHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/TlogHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/TlogHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/VersionHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/VersionHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/VersionHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/VersionHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/ChatHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/ChatHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/ChatHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/ChatHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/GameHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/GameHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/GameHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/GameHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LanguageHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LanguageHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LanguageHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LanguageHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LobbyCreateSinglePlayerHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyCreateSinglePlayerHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LobbyCreateSinglePlayerHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyCreateSinglePlayerHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LobbyDualplayerHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyDualplayerHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LobbyDualplayerHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyDualplayerHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LobbyHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LobbyHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LobbyMultiplayerHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyMultiplayerHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LobbyMultiplayerHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbyMultiplayerHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LobbySelectHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbySelectHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LobbySelectHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LobbySelectHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LoginHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LoginHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LoginHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LoginHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/LoginTypeHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/LoginTypeHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/LoginTypeHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/LoginTypeHandler.java diff --git a/server/src/org/moparforia/server/net/packethandlers/golf/TrackTestLoginHandler.java b/server/src/main/java/org/moparforia/server/net/packethandlers/golf/TrackTestLoginHandler.java similarity index 100% rename from server/src/org/moparforia/server/net/packethandlers/golf/TrackTestLoginHandler.java rename to server/src/main/java/org/moparforia/server/net/packethandlers/golf/TrackTestLoginHandler.java diff --git a/server/src/org/moparforia/server/track/TrackCategory.java b/server/src/main/java/org/moparforia/server/track/TrackCategory.java similarity index 100% rename from server/src/org/moparforia/server/track/TrackCategory.java rename to server/src/main/java/org/moparforia/server/track/TrackCategory.java diff --git a/server/src/org/moparforia/server/track/TrackManager.java b/server/src/main/java/org/moparforia/server/track/TrackManager.java similarity index 100% rename from server/src/org/moparforia/server/track/TrackManager.java rename to server/src/main/java/org/moparforia/server/track/TrackManager.java diff --git a/server/src/org/moparforia/server/track/TrackSet.java b/server/src/main/java/org/moparforia/server/track/TrackSet.java similarity index 100% rename from server/src/org/moparforia/server/track/TrackSet.java rename to server/src/main/java/org/moparforia/server/track/TrackSet.java diff --git a/server/src/org/moparforia/server/track/TrackSetDifficulty.java b/server/src/main/java/org/moparforia/server/track/TrackSetDifficulty.java similarity index 100% rename from server/src/org/moparforia/server/track/TrackSetDifficulty.java rename to server/src/main/java/org/moparforia/server/track/TrackSetDifficulty.java diff --git a/server/src/org/moparforia/server/util/SHA1.java b/server/src/main/java/org/moparforia/server/util/SHA1.java similarity index 100% rename from server/src/org/moparforia/server/util/SHA1.java rename to server/src/main/java/org/moparforia/server/util/SHA1.java diff --git a/server/src/org/moparforia/server/util/StatResetter.java b/server/src/main/java/org/moparforia/server/util/StatResetter.java similarity index 100% rename from server/src/org/moparforia/server/util/StatResetter.java rename to server/src/main/java/org/moparforia/server/util/StatResetter.java diff --git a/server/src/org/moparforia/server/util/StockTrackUploader.java b/server/src/main/java/org/moparforia/server/util/StockTrackUploader.java similarity index 100% rename from server/src/org/moparforia/server/util/StockTrackUploader.java rename to server/src/main/java/org/moparforia/server/util/StockTrackUploader.java diff --git a/shared/src/META-INF/MANIFEST.MF b/shared/src/META-INF/MANIFEST.MF deleted file mode 100644 index 909ad01d..00000000 --- a/shared/src/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: netty-3.6.6.Final.jar netty-3.6.6.Final-sources.jar mongo- - java-driver-2.9.3.jar morphia-1.2.2.jar -Main-Class: org.moparforia.server.Server - diff --git a/shared/src/org/moparforia/shared/Tools.java b/shared/src/main/java/org/moparforia/shared/Tools.java similarity index 100% rename from shared/src/org/moparforia/shared/Tools.java rename to shared/src/main/java/org/moparforia/shared/Tools.java diff --git a/shared/src/org/moparforia/shared/Track.java b/shared/src/main/java/org/moparforia/shared/Track.java similarity index 100% rename from shared/src/org/moparforia/shared/Track.java rename to shared/src/main/java/org/moparforia/shared/Track.java