OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Mon, 10 Dec 2012 16:52:25 +0000 (01:52 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 10 Dec 2012 16:52:25 +0000 (01:52 +0900)
Conflicts:
common/chemicraft/PacketHandler.java
common/chemicraft/TileEntityScienceCraftingTable.java

1  2 
common/chemicraft/PacketHandler.java
common/chemicraft/TileEntityScienceCraftingTable.java

@@@ -28,25 -28,21 +28,37 @@@ public class PacketHandler implements I
        public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) {\r
                if (packet.channel.equals("chemicraft")) {\r
                        ByteArrayDataInput var1 = ByteStreams.newDataInput(packet.data);\r
 +\r
 +                      //TileEntityのx, y, z座標\r
                        int x, y, z;\r
++<<<<<<< HEAD
 +                      //activeTab\r
 +                      String activeTab;\r
++=======
+                       String tab;\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
  \r
 -                      // パケットからデータ読み込み\r
 +                      //座標読み込み\r
                        x = var1.readInt();\r
                        y = var1.readInt();\r
                        z = var1.readInt();\r
++<<<<<<< HEAD
 +                      //activeTab読み込み\r
 +                      activeTab = var1.readUTF();\r
++=======
+                       tab = var1.readUTF();\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
  \r
                        // TileEntityを取得し読み込んだデータを送る\r
                        World world = ChemiCraft.proxy.getClientWorld();\r
                        TileEntity tileEntity = world.getBlockTileEntity(x, y, z);\r
                        if (tileEntity instanceof TileEntityScienceCraftingTable) {\r
                                TileEntityScienceCraftingTable var2 = (TileEntityScienceCraftingTable) tileEntity;\r
++<<<<<<< HEAD
 +                              var2.setActiveTab(activeTab);\r
++=======
+                               var2.handlePacket(new Object[]{tab});\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
                        }\r
                }\r
        }\r
        public static Packet getPacket(TileEntityScienceCraftingTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
 +\r
 +              //Blockのx, y, z座標\r
                int x, y, z;\r
++<<<<<<< HEAD
 +              //activeTab\r
 +              String activeTab;\r
++=======
+               String tab;\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
  \r
 -              // データの用意\r
 +              // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
                z = tileEntity.zCoord;\r
++<<<<<<< HEAD
 +              //activeTabに代入\r
 +              activeTab = tileEntity.getActiveTab();\r
++=======
+               tab = tileEntity.getActiveTab();\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
  \r
                try {\r
                        var2.writeInt(x);\r
                        var2.writeInt(y);\r
                        var2.writeInt(z);\r
++<<<<<<< HEAD
 +                      var2.writeUTF(activeTab);\r
++=======
+                       var2.writeUTF(tab);\r
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
                } catch (IOException e) {\r
                        e.printStackTrace();\r
                }\r
@@@ -127,6 -116,10 +127,13 @@@ public class TileEntityScienceCraftingT
        }
  
  
++<<<<<<< HEAD
++=======
+       public void handlePacket(Object[] data) {
+           this.activeTab = (String) data[0];
+       }
++>>>>>>> 820e884ca2933199d4be03f7de49a491a7f9e93e
  
        @Override
        public int getStartInventorySide(ForgeDirection side) {