WIP window system

HoverEpic · HoverEpic · commit 0970fbc6df29 · 2017-12-24T13:45:50.000+01:00
diff --git a/src/main/java/org/dragonet/proxy/network/InventoryTranslatorRegister.java b/src/main/java/org/dragonet/proxy/network/InventoryTranslatorRegister.java
@@ -66,10 +66,9 @@ public static PEPacket[] sendPlayerInventory(UpstreamSession session) {
     public static void open(UpstreamSession session, ServerOpenWindowPacket win) {
         closeOpened(session, true);
         if (TRANSLATORS.containsKey(win.getType())) {
-            CachedWindow cached = new CachedWindow(win.getWindowId(), win.getType(), 36 + win.getSlots());
+            CachedWindow cached = new CachedWindow(win.getWindowId(), win.getType(), win.getSlots());
             session.getWindowCache().cacheWindow(cached);
             TRANSLATORS.get(win.getType()).open(session, cached);
-
             com.github.steveice10.packetlib.packet.Packet[] items = session.getWindowCache().getCachedPackets(win.getWindowId());
             for (com.github.steveice10.packetlib.packet.Packet item : items) {
                 if (item != null) {
@@ -80,6 +79,7 @@ public static void open(UpstreamSession session, ServerOpenWindowPacket win) {
                     }
                 }
             }
+            System.out.println("Window " + win.getWindowId() + " opened !");
         } else {
             // Not supported
             session.getDownstream().send(new ClientCloseWindowPacket(win.getWindowId()));
@@ -90,35 +90,20 @@ public static void closeOpened(UpstreamSession session, boolean byServer) {
         if (session.getDataCache().containsKey(CacheKey.WINDOW_OPENED_ID)) {
             // There is already a window opened
             int id = (int) session.getDataCache().remove(CacheKey.WINDOW_OPENED_ID);
-            if (!byServer) {
-                session.getDownstream().send(new ContainerClosePacket((byte) (id & 0xFF)));
+            System.out.println("Window " + id + " closed !");
+            if (byServer) {
+                session.sendPacket(new ContainerClosePacket(id), true);
+            } else {
+                session.getDownstream().send(new ClientCloseWindowPacket(id));
             }
             if (session.getDataCache().containsKey(CacheKey.WINDOW_BLOCK_POSITION)) {
                 // Already a block was replaced to Chest, reset it
                 session.sendFakeBlock(((Position) session.getDataCache().get(CacheKey.WINDOW_BLOCK_POSITION)).getX(),
                         ((Position) session.getDataCache().get(CacheKey.WINDOW_BLOCK_POSITION)).getY(),
-                        ((Position) session.getDataCache().remove(CacheKey.WINDOW_BLOCK_POSITION)).getZ(), 1, // Set to
-                        // stone
-                        // since
-                        // we
-                        // don't
-                        // know
-                        // what
-                        // it
-                        // was,
-                        // server
-                        // will
-                        // correct
-                        // it
-                        // once
-                        // client
-                        // interacts
-                        // it
+                        ((Position) session.getDataCache().remove(CacheKey.WINDOW_BLOCK_POSITION)).getZ(), 1,
+                        // Set to stone since we don't know what it was, server will correct it once client interacts it
                         0);
             }
-            if (byServer) {
-                session.sendPacket(new ContainerClosePacket((byte) (id & 0xFF)), true);
-            }
         }
     }
 
diff --git a/src/main/java/org/dragonet/proxy/network/PacketTranslatorRegister.java b/src/main/java/org/dragonet/proxy/network/PacketTranslatorRegister.java
@@ -35,6 +35,7 @@
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerSetExperiencePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnMobPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.spawn.ServerSpawnPaintingPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerCloseWindowPacket;
 import org.dragonet.proxy.protocol.PEPacket;
 import org.dragonet.proxy.protocol.packets.*;
 
@@ -93,6 +94,7 @@ public final class PacketTranslatorRegister {
         //
         // //Inventory
         PC_TO_PE_TRANSLATOR.put(ServerOpenWindowPacket.class, new PCOpenWindowPacketTranslator());
+        PC_TO_PE_TRANSLATOR.put(ServerCloseWindowPacket.class, new PCClosedWindowPacketTranslator());
         PC_TO_PE_TRANSLATOR.put(ServerWindowItemsPacket.class, new PCWindowItemsTranslator());
         PC_TO_PE_TRANSLATOR.put(ServerSetSlotPacket.class, new PCSetSlotPacketTranslator());
 
diff --git a/src/main/java/org/dragonet/proxy/network/translator/inv/ChestWindowTranslator.java b/src/main/java/org/dragonet/proxy/network/translator/inv/ChestWindowTranslator.java
@@ -12,10 +12,8 @@
  */
 package org.dragonet.proxy.network.translator.inv;
 
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import org.dragonet.proxy.data.inventory.InventoryType;
-import org.dragonet.proxy.data.nbt.tag.CompoundTag;
-import org.dragonet.proxy.data.nbt.tag.IntTag;
-import org.dragonet.proxy.data.nbt.tag.StringTag;
 import org.dragonet.proxy.network.CacheKey;
 import org.dragonet.proxy.network.UpstreamSession;
 import org.dragonet.proxy.network.cache.CachedWindow;
@@ -24,6 +22,7 @@
 import org.dragonet.proxy.protocol.packets.BlockEntityDataPacket;
 import org.dragonet.proxy.protocol.packets.ContainerOpenPacket;
 import org.dragonet.proxy.protocol.packets.InventoryContentPacket;
+import org.dragonet.proxy.protocol.packets.InventorySlotPacket;
 import org.dragonet.proxy.protocol.type.Slot;
 import org.dragonet.proxy.utilities.BlockPosition;
 
@@ -33,23 +32,19 @@ public boolean open(UpstreamSession session, CachedWindow window) {
         BlockPosition pos = new BlockPosition((int) session.getEntityCache().getClientEntity().x,
                 (int) session.getEntityCache().getClientEntity().y - 4,
                 (int) session.getEntityCache().getClientEntity().z);
+
         session.getDataCache().put(CacheKey.WINDOW_OPENED_ID, window.windowId);
-//        session.getDataCache().put(CacheKey.WINDOW_BLOCK_POSITION, pos);
-//        session.sendFakeBlock(pos.x, pos.y, pos.z, 54, 0);
-//        CompoundTag tag = new CompoundTag(null);
-//        tag.putString("id", "Chest");
-//        tag.putInt("x", pos.x);
-//        tag.putInt("y", pos.y);
-//        tag.putInt("z", pos.z);
-//        BlockEntityDataPacket blockEntityData = new BlockEntityDataPacket();
-//        blockEntityData.blockPosition = new BlockPosition(pos.x, pos.y, pos.z);
-//        blockEntityData.tag = tag;
-//        session.sendPacket(blockEntityData);
+        session.getDataCache().put(CacheKey.WINDOW_BLOCK_POSITION, pos);
+        session.sendFakeBlock(pos.x, pos.y, pos.z, 54, 0);
+
+        BlockEntityDataPacket blockEntityData = new BlockEntityDataPacket();
+        blockEntityData.blockPosition = new BlockPosition(pos.x, pos.y, pos.z);
+        blockEntityData.tag = ItemBlockTranslator.translateBlockEntityToPE(ItemBlockTranslator.newTileTag("Chest", pos.x, pos.y, pos.z));
+        session.sendPacket(blockEntityData);
 
         ContainerOpenPacket pk = new ContainerOpenPacket();
+        pk.eid = -1;
         pk.windowId = window.windowId;
-        // pk. = window.size <= 27 ? (short)(InventoryType.SlotSize.CHEST & 0xFFFF) :
-        // (short)(InventoryType.SlotSize.DOUBLE_CHEST & 0xFFFF);
         pk.type = window.size <= 27 ? InventoryType.PEInventory.CHEST : InventoryType.PEInventory.DOUBLE_CHEST;
         pk.position = new BlockPosition(pos.x, pos.y, pos.z);
         session.sendPacket(pk);
@@ -60,17 +55,24 @@ public void updateContent(UpstreamSession session, CachedWindow window) {
         sendContent(session, window);
     }
 
-    public void updateSlot(UpstreamSession session, CachedWindow window, int slotIndex) {
-        sendContent(session, window);// TOO LAZY LOL
+    public void updateSlot(UpstreamSession session, CachedWindow win, int slotIndex) {
+        InventorySlotPacket pk = new InventorySlotPacket();
+        pk.item = ItemBlockTranslator.translateSlotToPE(win.slots[slotIndex]);
+        pk.slotId = slotIndex;
+        pk.windowId = win.windowId;
+        session.sendPacket(pk, true);
+        System.out.println("update window " + + win.windowId + " slot " + slotIndex);
+//        sendContent(session, window);// TOO LAZY LOL
     }
 
     private void sendContent(UpstreamSession session, CachedWindow win) {
         InventoryContentPacket pk = new InventoryContentPacket();
-        pk.windowId = (byte) (win.windowId & 0xFF);
+        pk.windowId = win.windowId;
         pk.items = new Slot[win.slots.length];
         for (int i = 0; i < pk.items.length; i++) {
             pk.items[i] = ItemBlockTranslator.translateSlotToPE(win.slots[i]);
         }
         session.sendPacket(pk, true);
+        System.out.println("update window " + + win.windowId + " set all content");
     }
 }
diff --git a/src/main/java/org/dragonet/proxy/network/translator/pc/PCClosedWindowPacketTranslator.java b/src/main/java/org/dragonet/proxy/network/translator/pc/PCClosedWindowPacketTranslator.java
@@ -21,6 +21,7 @@
 public class PCClosedWindowPacketTranslator implements IPCPacketTranslator<ServerCloseWindowPacket> {
 
     public PEPacket[] translate(UpstreamSession session, ServerCloseWindowPacket packet) {
+        System.out.println("Window " + packet.getWindowId() + " closed from server !");
         session.getProxy().getGeneralThreadPool().execute(() -> {
             InventoryTranslatorRegister.closeOpened(session, true);
         });
diff --git a/src/main/java/org/dragonet/proxy/network/translator/pc/PCOpenWindowPacketTranslator.java b/src/main/java/org/dragonet/proxy/network/translator/pc/PCOpenWindowPacketTranslator.java
@@ -21,9 +21,9 @@
 public class PCOpenWindowPacketTranslator implements IPCPacketTranslator<ServerOpenWindowPacket> {
 
     public PEPacket[] translate(UpstreamSession session, ServerOpenWindowPacket packet) {
-//        session.getProxy().getGeneralThreadPool().execute(() -> {
-//            InventoryTranslatorRegister.open(session, packet);
-//        }); CLIENT CRASH
+        session.getProxy().getGeneralThreadPool().execute(() -> {
+            InventoryTranslatorRegister.open(session, packet);
+        });
         return null;
     }
 }
diff --git a/src/main/java/org/dragonet/proxy/network/translator/pe/PEInventoryTransactionPacketTranslator.java b/src/main/java/org/dragonet/proxy/network/translator/pe/PEInventoryTransactionPacketTranslator.java
@@ -49,7 +49,7 @@ public Packet[] translate(UpstreamSession session, InventoryTransactionPacket pa
 
         switch (packet.transactionType) {
             case TYPE_NORMAL: //0
-//                System.out.println("TYPE_NORMAL");
+                System.out.println("TYPE_NORMAL");
                 List<Packet> packets = new ArrayList();
 
                 for (InventoryTransactionAction action : packet.actions) {
@@ -64,10 +64,10 @@ public Packet[] translate(UpstreamSession session, InventoryTransactionPacket pa
                 }
                 return packets.toArray(new Packet[]{});
             case TYPE_MISMATCH: //1
-//                System.out.println("TYPE_MISMATCH");
+                System.out.println("TYPE_MISMATCH");
                 break;
             case TYPE_USE_ITEM: //2
-//                System.out.println("TYPE_USE_ITEM");
+                System.out.println("TYPE_USE_ITEM");
                 UseItemData useItemData = (UseItemData) packet.transactionData;
                 if (useItemData.blockPos.equals(new BlockPosition(0, 0, 0))) {
                     return null;
@@ -98,7 +98,7 @@ public Packet[] translate(UpstreamSession session, InventoryTransactionPacket pa
 
                 }
             case TYPE_USE_ITEM_ON_ENTITY: //3
-//                System.out.println("TYPE_USE_ITEM_ON_ENTITY");
+                System.out.println("TYPE_USE_ITEM_ON_ENTITY");
                 UseItemOnEntityData useItemOnEntityData = (UseItemOnEntityData) packet.transactionData;
                 CachedEntity cachedEntity = session.getEntityCache().getByLocalEID(useItemOnEntityData.entityRuntimeId);
                 if (cachedEntity == null) {
@@ -114,7 +114,7 @@ public Packet[] translate(UpstreamSession session, InventoryTransactionPacket pa
                 );
                 return new Packet[]{interractPacket};
             case TYPE_RELEASE_ITEM: //4
-//                System.out.println("TYPE_RELEASE_ITEM");
+                System.out.println("TYPE_RELEASE_ITEM");
                 ReleaseItemData releaseItemData = (ReleaseItemData) packet.transactionData;
 //                ClientPlayerActionPacket act = new ClientPlayerActionPacket(
 //                    com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction.DROP_ITEM,
diff --git a/src/main/java/org/dragonet/proxy/network/translator/pe/PEWindowClosePacketTranslator.java b/src/main/java/org/dragonet/proxy/network/translator/pe/PEWindowClosePacketTranslator.java
@@ -21,6 +21,7 @@
 public class PEWindowClosePacketTranslator implements IPEPacketTranslator<ContainerClosePacket> {
 
     public Packet[] translate(UpstreamSession session, ContainerClosePacket packet) {
+        System.out.println("Window " + packet.windowId + " closed from client !");
         session.getProxy().getGeneralThreadPool().execute(() -> {
             InventoryTranslatorRegister.closeOpened(session, false);
         });
diff --git a/src/main/java/org/dragonet/proxy/protocol/packets/ContainerOpenPacket.java b/src/main/java/org/dragonet/proxy/protocol/packets/ContainerOpenPacket.java
@@ -21,8 +21,8 @@ public int pid() {
 
     @Override
     public void encodePayload() {
-        putByte((byte) (windowId & 0xFF));
-        putByte((byte) (type & 0xFF));
+        putByte((byte) (windowId));
+        putByte((byte) (type));
         putBlockPosition(position);
         putVarLong(eid);
     }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`public class PCOpenWindowPacketTranslator implements IPCPacketTranslator<ServerOpenWindowPacket> {`
`22`	`22`
`23`	`23`	`public PEPacket[] translate(UpstreamSession session, ServerOpenWindowPacket packet) {`
`24`		`-// session.getProxy().getGeneralThreadPool().execute(() -> {`
`25`		`-// InventoryTranslatorRegister.open(session, packet);`
`26`		`-// }); CLIENT CRASH`
	`24`	`+ session.getProxy().getGeneralThreadPool().execute(() -> {`
	`25`	`+ InventoryTranslatorRegister.open(session, packet);`
	`26`	`+ });`
`27`	`27`	`return null;`
`28`	`28`	`}`
`29`	`29`	`}`