Merge pull request #16 from gen0cide/version3

fixed server indexing and added new logo

Author: gen0cide

client/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.firescape</groupId>
   <artifactId>firescape-client</artifactId>
-  <version>2.0</version>
+  <version>3.0</version>
 
   <properties>
     <maven.compiler.source>9</maven.compiler.source>

client/src/main/java/org/firescape/client/GameConnection.java

@@ -354,12 +354,15 @@ protected void checkConnection() {
   }
 
   private void handlePacket(Command.Server opcode, int ptype, int psize) {
-    System.out.println(String.format("[Packet] <<< %s(id=%d) size=%d\n%s",
-                                     opcode.name(),
-                                     ptype,
-                                     psize,
-                                     Utility.bytesToHex(Arrays.copyOfRange(incomingPacket, 0, psize))
-    ));
+    String assetDumpEnabled = System.getenv("FIRESCAPE_DUMP_INCOMING_PACKETS");
+    if (assetDumpEnabled != null) {
+      System.out.println(String.format("[Packet] <<< %s(id=%d) size=%d\n%s",
+                                       opcode.name(),
+                                       ptype,
+                                       psize,
+                                       Utility.bytesToHex(Arrays.copyOfRange(incomingPacket, 0, psize))
+      ));
+    }
     int offset = 1;
     if (opcode == Command.Server.SV_MESSAGE) {
       String s = new String(Arrays.copyOfRange(incomingPacket, 1, 1 + (psize - 1)));

client/src/main/java/org/firescape/client/Packet.java

@@ -209,14 +209,17 @@ public void flushPacket() throws IOException {
   }
 
   public void sendPacket() {
-    byte[] packetDebug = Arrays.copyOfRange(packetData, packetStart + 2, packetEnd);
-    System.out.println(String.format(
-      "[Packet] >>> %s(id=%d) size=%d\n%s",
-      Opcode.getClient(Version.CLIENT, packetData[packetStart + 2] & 0xff),
-      packetData[packetStart + 2] & 0xff,
-      packetDebug.length,
-      Utility.bytesToHex(packetDebug)
-    ));
+    String dumpPacketDebug = System.getenv("FIRESCAPE_DUMP_OUTGOING_PACKETS");
+    if (dumpPacketDebug != null) {
+      byte[] packetDebug = Arrays.copyOfRange(packetData, packetStart + 2, packetEnd);
+      System.out.println(String.format(
+        "[Packet] >>> %s(id=%d) size=%d\n%s",
+        Opcode.getClient(Version.CLIENT, packetData[packetStart + 2] & 0xff),
+        packetData[packetStart + 2] & 0xff,
+        packetDebug.length,
+        Utility.bytesToHex(packetDebug)
+      ));
+    }
     if (isaacOutgoing != null) {
       int i = packetData[packetStart + 2] & 0xff;
       packetData[packetStart + 2] = (byte) (i + isaacOutgoing.getNextValue());

client/src/main/java/org/firescape/client/StreamAudioPlayer.java

@@ -8,27 +8,22 @@
 public class StreamAudioPlayer {
 
   // from sun.audio.AudioDevice.openChannel
-  private static final AudioFormat pcmFormat = new AudioFormat(
-    AudioFormat.Encoding.ULAW,
-    8000, 8,
-    1, 1,
-    8000, true);
+  private static final AudioFormat pcmFormat = new AudioFormat(AudioFormat.Encoding.ULAW, 8000, 8, 1, 1, 8000, true);
   // from com.sun.media.sound.Toolkit.getPCMConvertedAudioInputStream
-  private static final AudioFormat lineFormat = new AudioFormat(
-    AudioFormat.Encoding.PCM_SIGNED, 8000,
-    16, 1, 2,
-    8000, ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN);
+  private static final AudioFormat lineFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
+                                                                8000,
+                                                                16,
+                                                                1,
+                                                                2,
+                                                                8000,
+                                                                ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN
+  );
   private Clip clip;
 
   public StreamAudioPlayer() throws LineUnavailableException {
     clip = AudioSystem.getClip();
   }
 
-  public void stopPlayer() {
-    clip.stop();
-    clip.flush();
-  }
-
   public void writeStream(byte buf[], int off, int len) throws IOException, LineUnavailableException {
     stopPlayer();
     clip.close();
@@ -38,4 +33,9 @@ public void writeStream(byte buf[], int off, int len) throws IOException, LineUn
     clip.open(audio);
     clip.start();
   }
+
+  public void stopPlayer() {
+    clip.stop();
+    clip.flush();
+  }
 }

client/src/main/java/org/firescape/client/Surface.java

@@ -1,7 +1,12 @@
 package org.firescape.client;
 
+import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class Surface implements ImageProducer, ImageObserver {
 
@@ -460,6 +465,7 @@ public void clear() {
 
   public void parseSprite(int spriteId, byte spriteData[], byte indexData[], int frameCount) {
     int indexOff = Utility.getUnsignedShort(spriteData, 0);
+    int debugIndexOff = indexOff;
     int fullWidth = Utility.getUnsignedShort(indexData, indexOff);
     indexOff += 2;
     int fullHeight = Utility.getUnsignedShort(indexData, indexOff);
@@ -497,7 +503,6 @@ public void parseSprite(int spriteId, byte spriteData[], byte indexData[], int f
             spriteTranslate[id] = true;
           }
         }
-
       } else if (unknown == 1) {
         for (int x = 0; x < spriteWidth[id]; x++) {
           for (int y = 0; y < spriteHeight[id]; y++) {
@@ -506,12 +511,54 @@ public void parseSprite(int spriteId, byte spriteData[], byte indexData[], int f
               spriteTranslate[id] = true;
             }
           }
-
         }
+      }
+      InputStream inputstream = this.getClass()
+                                    .getResourceAsStream("/org/firescape/client/conf/overwritten/" + id + ".png");
+      if (inputstream != null) {
+        System.out.println("Overwriting Sprite: " + id);
+        overwriteSpritePixels(id, inputstream);
+      }
+    }
+  }
 
+  public void overwriteSpritePixels(int id, InputStream inputstream) {
+    BufferedImage sprite = loadNewSprite(inputstream);
+    int[] pixelIndex = new int[sprite.getWidth() * sprite.getHeight()];
+    for (int y = 0; y < sprite.getHeight(); y++) {
+      for (int x = 0; x < sprite.getWidth(); x++) {
+        int pixel = sprite.getRGB(x, y);
+        if (pixel == 0) {
+          pixel = 1;
+        } else if (pixel == -65281) {
+          pixel = 0;
+        }
+        pixelIndex[x + y * spriteWidth[id]] = pixel;
       }
     }
+    Set<Integer> uniqueColors = new TreeSet<Integer>();
+    uniqueColors.add(-65281);
+    for (int i = 0; i < pixelIndex.length; i++) {
+      uniqueColors.add(pixelIndex[i]);
+    }
+
+    Integer[] colorList = uniqueColors.toArray(new Integer[uniqueColors.size()]);
+    int[] colorArray = new int[colorList.length];
+    for (int i = 0; i < colorList.length; i++) {
+      colorArray[i] = colorList[i].intValue();
+    }
+    spriteColourList[id] = colorArray;
+    spritePixels[id] = pixelIndex;
+  }
 
+  public BufferedImage loadNewSprite(InputStream is) {
+    try {
+      BufferedImage logo = ImageIO.read(is);
+      return logo;
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return null;
   }
 
   public void readSleepWord(int spriteId, byte spriteData[]) {
@@ -638,22 +685,22 @@ public void loadSprite(int spriteId) {
       pixels[pixel] = colour;
     }
 
-    //    int i = spriteId;
-    //    Sprite s = new Sprite(
-    //      spriteId,
-    //      spriteId,
-    //      spriteWidth[i],
-    //      spriteHeight[i],
-    //      spriteWidthFull[i],
-    //      spriteHeightFull[i],
-    //      spriteColourList[i].length,
-    //      spriteColourList[i],
-    //      spriteTranslateX[i],
-    //      spriteTranslateY[i],
-    //      spriteTranslate[i],
-    //      pixels
-    //    );
-    //    s.saveSprite();
+    //        int i = spriteId;
+    //        Sprite s = new Sprite(
+    //          spriteId,
+    //          spriteId,
+    //          spriteWidth[i],
+    //          spriteHeight[i],
+    //          spriteWidthFull[i],
+    //          spriteHeightFull[i],
+    //          spriteColourList[i].length,
+    //          spriteColourList[i],
+    //          spriteTranslateX[i],
+    //          spriteTranslateY[i],
+    //          spriteTranslate[i],
+    //          pixels
+    //        );
+    //        s.saveSprite();
 
     spritePixels[spriteId] = pixels;
     spriteColoursUsed[spriteId] = null;

client/src/main/java/org/firescape/client/Version.java

@@ -2,7 +2,7 @@
 
 public class Version {
 
-  public static short FIRESCAPE_VERSION = 2;
+  public static short FIRESCAPE_VERSION = 3;
   public static int CLIENT = 204;
   public static int CONFIG = 85;
   public static int MAPS = 63;

client/src/main/java/org/firescape/client/mudclient.java

@@ -5878,6 +5878,7 @@ private void menuItemClick(int i) {
     int msrcidx = menuSourceIndex[i];
     int mtargetindex = menuTargetIndex[i];
     int mitemid = menuItemID[i];
+    System.out.println("mitemid = " + mitemid);
     String mtext = menuTextVar[i];
     if (mitemid == 200) {
       walkToGroundItem(localRegionX, localRegionY, mx, my, true);
@@ -6107,6 +6108,7 @@ private void menuItemClick(int i) {
       super.clientStream.sendPacket();
     }
     if (mitemid == 2810) {
+      System.out.println("SENDING TRADE TO PLAYER ID = " + midx);
       super.clientStream.newPacket(Opcode.getClient(Version.CLIENT, Command.Client.CL_PLAYER_TRADE));
       super.clientStream.putShort(midx);
       super.clientStream.sendPacket();
@@ -7378,10 +7380,7 @@ private void renderLoginScreenViewports() {
     scene.render();
     surface.fade2black();
     surface.fade2black();
-    surface.drawSprite(gameWidth / 2 - surface.spriteWidth[spriteMedia + 10] / 2,
-                       gameHeight / 2 - 152,
-                       spriteMedia + 10
-    ); // runescape logo
+    surface.drawSprite(gameWidth / 2 - 245, gameHeight / 2 - 152, spriteMedia + 10); // runescape logo
 
     surface.drawSprite(spriteLogo, 0, 0, gameWidth, gameHeight);
     surface.drawWorld(spriteLogo);
@@ -7398,10 +7397,7 @@ private void renderLoginScreenViewports() {
     scene.render();
     surface.fade2black();
     surface.fade2black();
-    surface.drawSprite(gameWidth / 2 - surface.spriteWidth[spriteMedia + 10] / 2,
-                       gameHeight / 2 - 152,
-                       spriteMedia + 10
-    );
+    surface.drawSprite(gameWidth / 2 - 245, gameHeight / 2 - 152, spriteMedia + 10);
     surface.drawSprite(spriteLogo + 1, 0, 0, gameWidth, gameHeight);  // h was 200
     surface.drawWorld(spriteLogo + 1);
 
@@ -7427,10 +7423,7 @@ private void renderLoginScreenViewports() {
     surface.fade2black();
     surface.fade2black();
 
-    surface.drawSprite(gameWidth / 2 - surface.spriteWidth[spriteMedia + 10] / 2,
-                       gameHeight / 2 - 152,
-                       spriteMedia + 10
-    );
+    surface.drawSprite(gameWidth / 2 - 245, gameHeight / 2 - 152, spriteMedia + 10);
     surface.drawSprite(spriteMedia + 10, 0, 0, gameWidth, gameHeight);
     surface.drawWorld(spriteMedia + 10);
   }

client/src/main/resources/org/firescape/client/conf/overwritten/2010.png

@@ -0,0 +1,32 @@
+{
+  "gson": {
+    "DEFAULT_JSON_NON_EXECUTABLE": false,
+    "DEFAULT_LENIENT": false,
+    "DEFAULT_PRETTY_PRINT": false,
+    "DEFAULT_ESCAPE_HTML": true,
+    "DEFAULT_SERIALIZE_NULLS": false,
+    "DEFAULT_COMPLEX_MAP_KEYS": false,
+    "DEFAULT_SPECIALIZE_FLOAT_VALUES": false
+  },
+  "id": 0,
+  "offset": 3254,
+  "width": 16,
+  "height": 18,
+  "fullWidth": 64,
+  "fullHeight": 102,
+  "colorCount": 9,
+  "colors": [
+    16711935,
+    10526880,
+    8684676,
+    6776679,
+    16764365,
+    16758197,
+    9783611,
+    2693144,
+    16743548
+  ],
+  "translateX": 24,
+  "translateY": 9,
+  "translate": true
+}

conf/json/sprites/0.json

@@ -0,0 +1,32 @@
+{
+  "gson": {
+    "DEFAULT_JSON_NON_EXECUTABLE": false,
+    "DEFAULT_LENIENT": false,
+    "DEFAULT_PRETTY_PRINT": false,
+    "DEFAULT_ESCAPE_HTML": true,
+    "DEFAULT_SERIALIZE_NULLS": false,
+    "DEFAULT_COMPLEX_MAP_KEYS": false,
+    "DEFAULT_SPECIALIZE_FLOAT_VALUES": false
+  },
+  "id": 1,
+  "offset": 3254,
+  "width": 16,
+  "height": 18,
+  "fullWidth": 64,
+  "fullHeight": 102,
+  "colorCount": 9,
+  "colors": [
+    16711935,
+    10526880,
+    8684676,
+    6776679,
+    16764365,
+    16758197,
+    9783611,
+    2693144,
+    16743548
+  ],
+  "translateX": 24,
+  "translateY": 9,
+  "translate": true
+}